Updated Czech translation.

author: Michal Bukovjan <mbukovjan@mandriva.com> 2010-06-08 19:50:34 +0000
committer: Michal Bukovjan <mbukovjan@mandriva.com> 2010-06-08 19:50:34 +0000
commit: 29d994ed809a5e12afe3cd93c3bedbe29a3dee40 (patch)
tree: 4a93530fecb7258561f2a93b1ec38359e49869f0 /perl-install/run_program.pm
parent: 55fc2182b6800a0e42fb3dceba1e1e795d13cccb (diff)
download: drakx-29d994ed809a5e12afe3cd93c3bedbe29a3dee40.tar
drakx-29d994ed809a5e12afe3cd93c3bedbe29a3dee40.tar.gz
drakx-29d994ed809a5e12afe3cd93c3bedbe29a3dee40.tar.bz2
drakx-29d994ed809a5e12afe3cd93c3bedbe29a3dee40.tar.xz
drakx-29d994ed809a5e12afe3cd93c3bedbe29a3dee40.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
 msgid "Disconnect..."
 msgstr "Katkaise yhteys..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
 msgstr "K�ynnist�n yhteytt�..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "Katkaisen yhteyden..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7358,120 +7923,115 @@ msgstr ""
 "etc/sysconfig/network-scripts/net_cnx_down\n"
 "ollessasi roottina."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "Yhteys internettiin on nyt katkaistu."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "M��rittele internetyhteys..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "L�hiverkon asetukset"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Laite"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Ajurit"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Liit�nt�"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Tila:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Aseta paikallisverkko..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Perustila"
+#: ../../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
 msgid "Please Wait... Applying the configuration"
 msgstr "Odota hetki... Otetaan asetukset k�ytt��n"
 
-#: ../../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 "L�hiverkon asetukset"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Laite %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "K�ynnistysprotokolla"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "K�ynnistetty koneen k�ynnist�misen yhteydess�"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "DHCP-asiakas"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Poista k�yt�st�"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Aktiivinen"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Ota k�ytt��n"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Aktiivinen"
 
-#: ../../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 "Internetyhteyden asetus"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Internetyhteyden asetus"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Yhteyden nimi: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parametrit"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Yhteydentarjoajan dns 1 (vapaaehtoinen)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Yhteydentarjoajan�dns�2�(vapaaehtoinen)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Verkkokortti"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP-asiakas"
 
@@ -7542,15 +8102,30 @@ msgstr ""
 "Systeemi on nyt t�ysin suljettu.\n"
 "Turvallisuusasetukset ovat tiukimmillaan."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Asetan turvatasoa"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Valitse optioita palvelimelle"
+
+#: ../../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 "Asetan turvatasoa"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Kontrollipaneeli"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Valitse haluamasi ty�kalu"
 
@@ -7578,81 +8153,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "J�rjestelm�n p�ivityst� ei voida aloittaa!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "serial_usb:ta ei l�ytynyt\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Emuloi kolmatta n�pp�int�?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Testaa hiiri"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "Verkon monitorointi"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Statistiikka"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "L�hetysnopeus: "
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "Vastaanottonopeus: "
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Sulje"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "Otan yhteyden internettiin "
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "Katkaisen internetyhteyden"
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "Internetyhteyden katkaiseminen ep�onnistui."
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "Internetyhteys katkaistu."
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Yhteys muodostettu."
-
-#: ../../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 "l�hetetty: "
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "vastaanotettu: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Yhdist�"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Katkaise yhteys"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Palomuurin asetukset"
@@ -7683,21 +8191,101 @@ msgstr ""
 "\n"
 "Paina \"M��rittele\" pystyytt��ksesi palomuurin"
 
-#: ../../tinyfirewall.pm_.c:10
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Kieliasetukset"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Asennuksen luokka"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Kiintolevyjen tunnistus"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Hiiren m��rittely"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "N�pp�imist�n valinta"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Tietoturva"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Tiedostoj�rjestelm�t"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Levyjen osiointi"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Asennettavat paketit"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Asenna j�rjestelm�"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "K�ytt�jien lis��minen"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Verkkoasetukset"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Palvelujen asettaminen"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "K�ynnistyslevyke"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Lataajan asetus"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "X:n asentaminen"
+
+# Asennuksen sivuvalikko
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Lopeta asennus"
+
+#: ../../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 ""
 "tinyfirewallin asettaminen\n"
 "\n"
-"T�m� vaihe asettaa henkil�kohtaisen palomuurin Linux Mandrake\n"
+"T�m� vaihe asettaa henkil�kohtaisen palomuurin Mandrake Linux\n"
 "-j�rjestelm��si. Mik�li haluat tehokkaan palomuuriratkaisun, hae\n"
 "lis�tietoja MandrakeSecurity Firewall distribuutiosta."
 
-#: ../../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"
@@ -7716,7 +8304,7 @@ msgstr ""
 "suojaa tietokoneesi palomuurilla. Voit muuttaa n�it� asetuksia milloin \n"
 "haluat vain k�ynnist�m�ll� t�m�n ohjelman uudelleen."
 
-#: ../../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"
@@ -7728,7 +8316,7 @@ msgstr ""
 "omalle tietokoneellesi, voit turvallisesti vastata EI t�h�n kysymykseen.\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"
@@ -7739,7 +8327,7 @@ msgstr ""
 "nimipalvelinta  jakamaan IP- ja vy�hyketietoja internettiin, vastaa 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"
@@ -7754,7 +8342,7 @@ msgstr ""
 "salasanasi, jos k�yt�t sit�. Ssh-yhteys on sit�vastoin suojattu, joten\n"
 "kukaan ei pysty salakuuntelemaan sit�."
 
-#: ../../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"
@@ -7766,7 +8354,7 @@ msgstr ""
 "Suosittelemme ett� vastaisit Ei t�h�n kohtaan ja k�ytt�isit\n"
 "telnetin sijaan ssh:ta.\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"
@@ -7779,7 +8367,7 @@ msgstr ""
 "mik�li se siirret��n FTP-protokollan kautta, sill� FTP ei suojaa\n"
 "siirrett�vi� salasanoja.\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"
@@ -7792,7 +8380,7 @@ msgstr ""
 "ominaisuus pois palomuurin avulla.\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"
@@ -7804,7 +8392,7 @@ msgstr ""
 "ihmisille, jotka haluavat hakea postinsa t�lt� koneelta omillensa.\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"
@@ -7817,7 +8405,7 @@ msgstr ""
 "(eli se on dynaamisesti m��r�tty), ominaisuuden k�ytt� \n"
 "pit�� sallia. Pit��k� paikkaansa?\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"
@@ -7831,7 +8419,7 @@ msgstr ""
 "ei ole osa suurempaa toimistoa tai et ole kuullut t�llaisesta, \n"
 "j�rjestelm� ei luultavasti ole synkronoitu."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -7843,99 +8431,116 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "En voi avata %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Tiedostoa %s ei voi avata kirjoittamista varten: %s\n"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Asiakasohjelmat eri protokollille (ssh jne)"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Kehitysymp�rist�"
+msgid "Network Computer (client)"
+msgstr "Verkkop��te (asiakas)"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Ty�asema"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-, SMB-, SSH- ja v�lipalvelin"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Palomuuri / Reititys"
+msgid "Office"
+msgstr "Toimistosovellukset"
+
+#: ../../share/compssUsers:999
+msgid "Gnome Workstation"
+msgstr "Gnome-ty�asema"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Henkil�kohteisen tiedon hallinta"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Ty�kalut Palm Pilotin tai Visorin liitt�miseksi"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Grafiikka"
+msgid "Workstation"
+msgstr "Ty�asema"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Firewall/Router"
+msgstr "Palomuuri / Reititys"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Verkkop��te (asiakas)"
+msgid "Domain Name and Network Information Server"
+msgstr "Nimipalvelin ja tietoverkon informaatiopalvelin"
+
+# ../../share/compssUsers
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Office-ohjelmistot: tekstink�sittely (kword, abiword), taulukkolaskenta "
+"(kspread,gnumeric), pdf-lukijat jne"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr "��nenk�sittely: mp3, midi, mikserit, jne"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet-asema"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Kirjoja ja ohjeita Linuxista sek� vapaan l�hdekoodin ohjelmista"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Toimistosovellukset"
+msgid "KDE Workstation"
+msgstr "KDE-ty�asema"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedia-asema"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, jne"
+
+#: ../../share/compssUsers:999
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
-"Valikoima ty�kaluja s�hk�postin ja nyytisten lukemiseen (pine, mutt, tin...) "
-"sek� internetiss� surffailuun"
+"Kokoelma ty�kaluja s�hk�postiin, nyytisiin, webiin, tiedostonsiirtoon ja "
+"jutusteluun"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C ja C++ ohjelmointity�kalut, kirjastot ja include-tiedostot"
+msgid "Database"
+msgstr "Tietokanta"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Nimipalvelin ja tietoverkon informaatiopalvelin"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL tai MySQL tietokantapalvelin"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Tilinpito-ohjelmia, kuten gnucash"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Ty�kalut, jotka helpottavat tietokoneesi asetusten muokkaamista"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL tai MySQL tietokantapalvelin"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - ��ni"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-, SMB-, SSH- ja v�lipalvelin"
+msgid "Utilities"
+msgstr "Apuohjelmat"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
@@ -7943,80 +8548,80 @@ msgstr "Dokumentaatio"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, jne"
+msgid "Console Tools"
+msgstr "Komentorivity�kalut"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Apuohjelmat"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix-postipalvelin, Inn-nyytispalvelin"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Internet station"
+msgstr "Internet-asema"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Graafinen ymp�rist�"
+msgid "Multimedia station"
+msgstr "Multimedia-asema"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - ��ni"
+#, fuzzy
+msgid "Configuration"
+msgstr "L�hiverkon asetukset"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Pelit: tasohyppely, korttipelit, strategia, jne"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Lis�� graafisia ty�p�yti� (Gnome, IceWM)"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videon katselu ja editointi"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K-ty�p�yt�ymp�rist�. Graafinen perusymp�rist� ja sen mukana tulevat ty�kalut"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Komentorivity�kalut"
+msgid "Graphical Environment"
+msgstr "Graafinen ymp�rist�"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "��nen sek� videon soitto- ja editointiohjelmat"
+msgid "Development"
+msgstr "Kehitysymp�rist�"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Tieteelliinen ty�asema"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache WWW-palvelin ja Pro-ftpd FTP-palvelin"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editorit, komentotulkit, tiedostoty�kalut, terminaalit"
+msgid "Tools to create and burn CD's"
+msgstr "Ty�kalut CD:iden luomiseen ja polttamiseen"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Kirjoja ja ohjeita Linuxista sek� vapaan l�hdekoodin ohjelmista"
+msgid "Office Workstation"
+msgstr "Toimistoty�asema"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Graafinen ymp�rist� k�ytt�j�yst�v�llisell� ohjelmistolla ja ty�kaluilla."
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, jne"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix-postipalvelin, Inn-nyytispalvelin"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafiikkaohjelmistot, kuten Gimp"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Pelit"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ja C++ ohjelmointity�kalut, kirjastot ja include-tiedostot"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
@@ -8024,34 +8629,35 @@ msgstr "Verkkotietokone (palvelin)"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafiikkaohjelmistot, kuten Gimp"
+msgid "Mail/Groupware/News"
+msgstr "S�hk�posti/Groupware/Nyytiset"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Toimistoty�asema"
+msgid "Game station"
+msgstr "Pelikone"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K-ty�p�yt�ymp�rist�. Graafinen perusymp�rist� ja sen mukana tulevat ty�kalut"
+msgid "Video players and editors"
+msgstr "Videon katselu ja editointi"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Lis�� graafisia ty�p�yti� (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafiikka"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Ty�kalut CD:iden luomiseen ja polttamiseen"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Pelit: tasohyppely, korttipelit, strategia, jne"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - CD:n poltto"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Valikoima ty�kaluja s�hk�postin ja nyytisten lukemiseen (pine, mutt, tin...) "
+"sek� internetiss� surffailuun"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
@@ -8060,39 +8666,30 @@ msgstr "Varmuuskopiointi, emulaattorit, j�rjestelm�n tarkkailu"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Tietokanta"
+msgid "Personal Finance"
+msgstr "Henkil�kohtainen kirjanpito"
 
 # ../../share/compssUsers
 #: ../../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 ""
-"Office-ohjelmistot: tekstink�sittely (kword, abiword), taulukkolaskenta "
-"(kspread,gnumeric), pdf-lukijat jne"
+"Graafinen ymp�rist� k�ytt�j�yst�v�llisell� ohjelmistolla ja ty�kaluilla."
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr "Asiakasohjelmat eri protokollille (ssh jne)"
 
 #: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Palvelin"
+msgid "Internet gateway"
+msgstr "Internetyhdysk�yt�v�"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Henkil�kohtainen kirjanpito"
-
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Asetusten muokkaus"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE-ty�asema"
+msgid "Sound and video playing/editing programs"
+msgstr "��nen sek� videon soitto- ja editointiohjelmat"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
@@ -8101,61 +8698,1269 @@ msgstr "Muut graafiset k�ytt�ymp�rist�t"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache WWW-palvelin ja Pro-ftpd FTP-palvelin"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editorit, komentotulkit, tiedostoty�kalut, terminaalit"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "S�hk�posti/Groupware/Nyytiset"
-
-#: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome-ty�asema"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Tilinpito-ohjelmia, kuten gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internetyhdysk�yt�v�"
+msgid "Games"
+msgstr "Pelit"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Ty�kalut Palm Pilotin tai Visorin liitt�miseksi"
+msgid "Personal Information Management"
+msgstr "Henkil�kohteisen tiedon hallinta"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Pelikone"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - CD:n poltto"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, jne"
+msgid "Scientific Workstation"
+msgstr "Tieteelliinen ty�asema"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Ty�kalut, jotka helpottavat tietokoneesi asetusten muokkaamista"
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "ei voi lukea tiedostoa /etc/sysconfig/autologin: %s"
 
-# ../../share/compssUsers
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Kokoelma ty�kaluja s�hk�postiin, nyytisiin, webiin, tiedostonsiirtoon ja "
-"jutusteluun"
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Haluatko k�ynnist�� verkon uudelleen"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Hyv�ksytk�?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Uudelleenk�ynnistet��n verkkokorttia:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "K�ynnist�n verkkolaitteen %s uudelleen. Haluatko jatkaa?"
+
+#, 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 ""
+#~ "Jos et tied� tarkemmin, niin yleinen valinta on \"/dev/hda\"\n"
+#~ "(prim��rinen master IDE-levyn ).tai \"/dev/sda\" (ensimm�inen SCSI-levy)."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "T�ss� ovat tulostusjonot.\n"
+#~ "Voit lis�t� uusia tai muuttaa olemassaolevia."
+
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Yhteyden nimi: "
+
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Valitse oletusk�ytt�j�:"
+
+#, fuzzy
+#~ msgid "Test the mouse here."
+#~ msgstr "Testaa hiiri"
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr "Valitse haluttu kieli asennukseen ja j�rjestelm�n k�ytt��n."
+
+#~ 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 ""
+#~ "Jatkaaksesi asennusta sinun t�ytyy hyv�ksy� yll� olevan lisenssin ehdot.\n"
+#~ "\n"
+#~ "\n"
+#~ "Valitse \"Hyv�ksy\", jos hyv�ksyt ehdot.\n"
+#~ "\n"
+#~ "\n"
+#~ "Valitse \"Kielt�ydy\", jos et hyv�ksy ehtoja. T�ll�in asennus p��ttyy "
+#~ "muuttamatta nykyisi� asetuksia."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Valitse n�pp�inasettelu allaolevasta listasta"
+
+#~ 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\"."
+
+#~ 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 ""
+#~ "Valitse:\n"
+#~ "\n"
+#~ "  - Mukautettu: Jos tunnet GNU/Linuxin ennest��n, voit valita erikseen "
+#~ "koneen k�ytt�tarkoituksen.\n"
+#~ "    Katso alta lis�tietoja.\n"
+#~ "\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�!"
+
+#~ 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 ""
+#~ "Sinun tulee nyt valita koneesi ensisijainen k�ytt�tarkoitus. Valinnat "
+#~ "ovat:\n"
+#~ "\n"
+#~ "* Ty�asema: ideaali valinta, jos aiot k�ytt�� tietokonettasi "
+#~ "jokap�iv�isiss� teht�viss�, joko ty�paikalla\n"
+#~ "  tai kotona.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Kehitysymp�rist�: hyv� valinta, jos aiot k�ytt�� tietokonettasi "
+#~ "ensisijaisesti ohjelmistokehitykseen.\n"
+#~ "  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"
+#~ "\n"
+#~ "\n"
+#~ "* 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."
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "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."
+
+#~ 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"
+
+#~ 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"
+#~ "\n"
+#~ "Jos haluat asettaa verkkoyhteydet my�hemmin tai olet jo asettanut\n"
+#~ "koneesi verkkoasetukset, valitse \"Valmis\"."
+
+#~ 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 ""
+#~ "Modeemia ei l�ydetty. Valitse sarjaportti, johon modeemi on kytketty.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tiedoksi: ensimm�inen sarjaportti (\"COM1\" Microsoft Windowsissa)\n"
+#~ "on \"ttyS0\" Linuxissa."
+
+#~ 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."
+
+#~ 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."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Kytke modeemisi p��lle ja valitse oikea vaihtoehto."
+
+#~ 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."
+
+#~ 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."
+
+#~ 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 ""
+#~ "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."
+
+#~ 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."
+
+#~ 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."
+
+#~ 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."
+
+#~ 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."
+
+#~ 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."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "Voit nyt asentaa aikavy�hykkeen sen mukaan, miss� p�in asut."
+
+#~ 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)."
+
+#~ 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 ""
+#~ "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 Mandrake Linuxn aikaisempien versioiden k�ytt�m� vanha \n"
+#~ "tulostusj�rjestelm�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jos sinulla ei ole kirjoitinta, valitse \"Ei kumpaakaan\"."
+
+#~ 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\"."
+
+#~ 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"
+
+#~ 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"
+
+#~ 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."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Valitse kirjoitin yll� olevasta listasta."
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "Voit antaa nyt yll�pit�j�n (root) salasanan Mandrake Linux "
+#~ "j�rjestelm�llesi. \n"
+#~ "Kirjoitusvirheiden est�miseksi salasana tulee antaa kaksi kertaa. \n"
+#~ "\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"
+#~ "\n"
+#~ "\n"
+#~ "�l� tee salasanastasi liian pitk�� tai monimutkaista, sill� sinun t�ytyy "
+#~ "muistaa \n"
+#~ "se ilman turhia ponnistuksia."
+
+#~ 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 ""
+#~ "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"
+#~ "\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"
+#~ "\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."
+
+#~ 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 ""
+#~ "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."
+
+#, 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 ""
+#~ "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."
+
+#~ 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 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!"
+
+#~ 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 ""
+#~ "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"
+#~ "\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."
+
+#~ 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 ""
+#~ "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"
+#~ "\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."
+
+#~ 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."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Jos haluat k�ytt�� graafista sis��nkirjoittautumista valitse \"Kyll�\".\n"
+#~ "Muuten valitse \"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 ""
+#~ "Voit valita j�rjestelm�si turvatason. Katso ohjekirjasta "
+#~ "yksityiskohtaisempia \n"
+#~ "tietoja turvatasojen vaikutuksesta. Tavallisesti jos et tied�, mit� "
+#~ "valita, k�yt� \n"
+#~ "oletusvalintaa.\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 ""
+#~ "J�rjestelm�si k�ynnistet��n nyt uudelleen.\n"
+#~ "\n"
+#~ "\n"
+#~ "Koneen p��llekytkemisen j�lkeen Mandrake Linux k�ynnistet��n "
+#~ "automaattisesti.\n"
+#~ "Jos haluat k�ytt�� my�s muita koneessa olevia k�ytt�j�rjestelmi�, katso "
+#~ "asianomaisia\n"
+#~ "lis�ohjeita."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "Tsekki (ohjelmoijat)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slovakia (Ohjelmoijat)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Luotavan profiilin nimi:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Kirjoita /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Palauta tiedostosta"
+
+#~ msgid "Save in file"
+#~ msgstr "Tallenna tiedostoon"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Palauta levykkeelt�"
+
+#~ msgid "Format all"
+#~ msgstr "Alusta kaikki"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Osioiden alustuksen j�lkeen,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "kaikki tieto n�ill� osioilla on h�vinnyt"
+
+#~ msgid "Reload"
+#~ msgstr "Uudelleenlataa"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr "Haluatko luoda automaattisen asennuslevyn linuxin monistamiseksi?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "ASDL-asetukset"
+
+#~ 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 ""
+#~ "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."
+
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Et�jonon nimi:"
+
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "Verkkoalueen nimi"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Ei kirjoitinta"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "rajoita"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Verkon monitorointi"
+
+#~ msgid "Profile "
+#~ msgstr "Profiili "
+
+#~ msgid "Statistics"
+#~ msgstr "Statistiikka"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "L�hetysnopeus: "
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "Vastaanottonopeus: "
+
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "Yhteyden nimi: "
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Otan yhteyden internettiin "
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Katkaisen internetyhteyden"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Internetyhteyden katkaiseminen ep�onnistui."
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Internetyhteys katkaistu."
+
+#~ msgid "Connection complete."
+#~ msgstr "Yhteys muodostettu."
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "Asetusten muokkaus"
 
-#~ msgid "GB"
-#~ msgstr "Gt"
+#~ msgid "sent: "
+#~ msgstr "l�hetetty: "
 
-#~ msgid "KB"
-#~ msgstr "Kt"
+#~ msgid "received: "
+#~ msgstr "vastaanotettu: "
 
-#~ msgid "TB"
-#~ msgstr "Tt"
+#~ msgid "Connect"
+#~ msgstr "Yhdist�"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minuuttia"
+#~ msgid "Disconnect"
+#~ msgstr "Katkaise yhteys"
 
-#~ msgid "1 minute"
-#~ msgstr "1 minuutti"
+#~ msgid "/File/_New"
+#~ msgstr "/Tiedosto/_Uusi"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sekuntia"
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Tiedosto/_Avaa"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Tiedosto/_Tallenna"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Tiedosto/Tallenna _Nimell�"
+
+#~ msgid "/File/-"
+#~ msgstr "/Tiedosto/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Optiot"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Optiot/Testi"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Apua"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Apua/_Tietoja..."
+
+#, fuzzy
+#~ msgid "Default Runlevel"
+#~ msgstr "Oletus"
+
+#~ msgid "Europe"
+#~ msgstr "Eurooppa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Poista jono"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Asetustiedoston sis�lt�� ei voida tulkita."
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Tunnistamaton asetustiedosto"
+
+#~ msgid "Adapter"
+#~ msgstr "Laite"
+
+#, fuzzy
+#~ msgid "Disable network"
+#~ msgstr "Poista k�yt�st�"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "Ota k�ytt��n"
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (tai ASDL) -yhteys"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Sulje"
+
+#~ 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."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Kyll�, tulosta ASCII-testisivu"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Kyll�, tulosta PostScript-testisivu"
+
+#~ msgid "Paper Size"
+#~ msgstr "Paperikoko"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Poista sivu ty�n j�lkeen?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Uniprint ajurin asetukset"
+
+#~ msgid "Color depth options"
+#~ msgstr "V�risyvyysasetukset"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Tulosta teksti postscript muodossa?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Korjaa askelmainen rivinvaihto?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Sivujen m��r� tulostettavalla sivulla"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Vasen/Oikea mariginaali pistein� (1/72 tuuma)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Yl�/Ala-mariginaalit pistein� (1/72 tuumina)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Lis�asetukset GhostScriptille"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Lis�tekstiasetukset"
+
+#~ msgid "Reverse page order"
+#~ msgstr "K��nteinen sivuj�rjestys"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS k�ynnistyy"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Valitse ulkoinen kirjoitinyhteys"
+
+#~ 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 ""
+#~ "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?"
+
+#~ 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 ""
+#~ "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?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Jonon nimi"
+
+#~ msgid "Spool directory"
+#~ msgstr "Jonohakemisto"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "L�hiverkon asetukset"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "Palveluntarjoajan dns 1"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "Palveluntarjoajan dns 2"
+
+#, fuzzy
+#~ msgid "fsck failed: "
+#~ msgstr "liitt�minen ep�onnistui: "
+
+#~ 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\"."
+
+#~ 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."
+
+#~ msgid "yellow pages"
+#~ msgstr "keltaiset sivut"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Miten haluat liitty� internettiin?"
diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po
index 323eb0b1e..bd89c56e0 100644
--- a/perl-install/share/po/gl.po
+++ b/perl-install/share/po/gl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\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-06-08 18:14+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez (mdk) <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -15,58 +15,58 @@ 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 ""
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 #, fuzzy
 msgid "Use Xinerama extension"
 msgstr "Usar detecci�n autom�tica"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 #, fuzzy
 msgid "Multi-head configuration"
 msgstr "lendo a configuraci�n"
 
-#: ../../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 "Tarxeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Seleccione unha tarxeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Escolla 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 "�Que configuraci�n de XFree quere usar?"
 
-#: ../../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 ""
 "XFree %s. A tarxeta est� soportada por XFree %s, que pode ter un mellor\n"
 "soporte 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 ""
 "A s�a tarxeta pode ter soporte de aceleraci�n 3D por hardware con 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 con aceleraci�n 3D por hardware"
 
-#: ../../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 ""
 "A s�a tarxeta pode ter soporte de aceleraci�n 3D por hardware, pero s� con\n"
 "XFree %s, ADVIRTA QUE ESTE SOPORTE � EXPERIMENTAL E PODE COLGAR O SISTEMA."
 
-#: ../../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 con aceleraci�n 3D por hardware 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"
@@ -113,27 +114,31 @@ msgstr ""
 "A s�a tarxeta est� soportada por XFree %s, que pode ter un mellor soporte en "
 "2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "Configuraci�n de XFree"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Seleccione a cantidade de memoria da tarxeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Escolla as opci�ns para o servidor"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Escolla o 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"
@@ -156,39 +161,39 @@ msgstr ""
 "xa que pode danalo.\n"
 "No caso de d�bida, escolla unha configuraci�n conservadora."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Frecuencia de actualizaci�n horizontal"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Frecuencia de actualizaci�n vertical"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "O monitor non est� configurado"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "A tarxeta gr�fica a�nda non est� configurada"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Resoluci�ns a�nda non escollidas"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "�Desexa probar a configuraci�n?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Aviso: probar esta tarxeta gr�fica pode colgar o ordenador"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Proba da configuraci�n"
 
-#: ../../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"
 "probe a cambiar alg�ns par�metros"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Ocorreu un erro:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Sa�ndo en %d segundos"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "�� esta a configuraci�n correcta?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Ocorreu un erro, probe a cambiar alg�ns par�metros"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Resoluci�n"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Escolla a resoluci�n e a profundidade de cor"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Tarxeta 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 "Modo experto"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Ver todo"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Resoluci�ns"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposici�n do teclado: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo de rato: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Dispositivo do rato: %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 "Frecuencia horizontal do monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frecuencia vertical do monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Tarxeta gr�fica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Tarxeta gr�fica: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Memoria da tarxeta gr�fica: %s KB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profundidade de cor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resoluci�n: %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 XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Preparando a configuraci�n de X-Window"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "�Qu� desexa facer?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Mudar o monitor"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Mudar a tarxeta gr�fica"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Mudar as opci�ns do servidor"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Mudar a resoluci�n"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Mostrar informaci�n"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Probar de novo"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Sa�r"
 
-#: ../../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 "Entre de novo en %s para activar os cambios"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Saia da sesi�n e use Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "Lanzar X11 � arrincar"
 
-#: ../../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,216 +429,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 ou m�is"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA est�ndar, 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 56 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 entrelazado (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 entrelazado, 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 estendido, 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 non-entrelazado, 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 alta-frecuencia, 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 "Monitor multi-frecuencia soportando 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 "Monitor multi-frecuencia soportando 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 "Monitor multi-frecuencia soportando 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 soportando 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 soportando 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 "Primeiro sector da partici�n de arranque"
 
-#: ../../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 "Primeiro sector do disco (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "Instalaci�n do 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 "�Onde quere instalar o cargador de arrinque?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "Instalaci�n do 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 con men� de texto"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO con men� gr�fico"
 
-#: ../../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 "Arrincar dende 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 "Opci�ns principais do cargador de arrinque"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Cargador de arrinque que usar"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Instalaci�n do cargador de arrinque"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Dispositivo de arrinque"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (non funciona en BIOS antigas)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Compacto"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "compacto"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Modo de v�deo"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Retardo antes de arrincar a imaxe por omisi�n"
 
-#: ../../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 "Contrasinal"
 
-#: ../../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 "Contrasinal (de novo)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Restrinxir opci�ns da li�a de comandos"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "restrinxir"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Baleirar /tmp en cada arrinque"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Tama�o exacto de memoria se for necesario (atop�ronse %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Activar perf�s m�ltiples"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Indicar o tama�o da memoria en MB"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "A opci�n ``restrinxir opci�ns da li�a de comandos'' non ten sentido sen "
 "contrasinal"
 
-#: ../../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 "Tente de novo"
 
-#: ../../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 "Os contrasinais non coinciden"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Mensaxe inicial"
 
-#: ../../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 "�Permitir o arrinque de CD?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr ""
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "�SO por omisi�n?"
 
-#: ../../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,145 +657,144 @@ msgstr ""
 "Estas son as diferentes entradas.\n"
 "Pode engadir algunhas m�is ou cambiar as que xa existen."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Engadir"
 
-#: ../../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 "Feito"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "�Que tipo de entrada desexa engadir?"
 
-#: ../../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 "Outros SO (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Outros SO (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Outros SO (windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Ra�z"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Agregar"
 
-#: ../../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-escritura"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "T�boa"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Inseguro"
 
-#: ../../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 "Por omisi�n"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr ""
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr ""
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Quitar entrada"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Etiqueta baleira non permitida"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Esta etiqueta xa se est� a usar"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "�Qu� tipo de particionamento quere?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "%s interfaces %s atopadas"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "�Ten algunha outra?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "�Ten algunha interface %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 "Non"
 
-#: ../../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 "Si"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Mire a informaci�n sobre o hardware"
 
 #. -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 "Instalando o controlador para a tarxeta %s %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(m�dulo %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 "�Que controlador de %s desexa probar?"
 
-#: ../../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 +812,20 @@ msgstr ""
 "analizar o equipo pode provocar que se pare, pero non deber�a\n"
 "causar ning�n dano."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Autodetecci�n"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Especificar as opci�ns"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Agora pode indicar as opci�ns para o m�dulo %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -817,11 +836,11 @@ msgstr ""
 "As opci�ns son da forma �nome=valor nome2=valor2 ...�.\n"
 "Por exemplo pode ter �io=0x300 irq=7�"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Opci�ns do m�dulo:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -830,33 +849,33 @@ msgstr ""
 "Fallo o cargar o m�dulo %s\n"
 "�Desexa retentalo con outros par�metros?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s xa foi engadido)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Este contrasinal � demasiado simple"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Indique o nome de usuario"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "O nome de usuario (login) s� debe conter letras, n�meros, '-' e '_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Este nome de usuario xa est� engadido"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Engadir usuario"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -865,55 +884,68 @@ msgstr ""
 "Introduza un usuario\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Aceptar usuario"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Nome 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 "Nome de usuario"
 
-#: ../../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 "Login autom�tico"
 
-#: ../../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 ""
 "P�dese configurar o ordenador para que se autentique automaticamente\n"
 "como un usuario.  Se non quere usar esta caracter�stica, prema o bot�n\n"
 "cancelar."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Escolla o usuario por defecto:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Escolla o xestor de fiestras para executar:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Escolla a lingua que desexe usar."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "Pode escoller outras linguas que estar�n dispo�ibles trala instalaci�n"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Todas"
+
 # 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,52 +969,57 @@ 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 "�Benvido ao GRUB, o selector de sistemas operativos!"
 
 #. -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 as teclas %c e %c para seleccionar a entrada marcada."
 
 #. -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 "Prema enter para arrincar o SO seleccionado, 'e' para editar os"
 
 #. -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 "comandos antes de arrincar, ou 'c' para a li�a de comandos."
 
 #. -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 "A entrada marcada arrincarase automaticamente en %d segundos."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "non hai espacio dabondo 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 "Escritorio"
 
 # Manter o '�' en iso-8859-1
 #. -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� Inicio"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "�Onde quere instalar o cargador de arrinque?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "axuda a�nda non implementada.\n"
@@ -995,516 +1032,703 @@ msgstr "Configuraci�n do estilo de arrinque"
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Ficheiro/_Novo"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Ficheiro/_Abrir"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>A"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Ficheiro/_Gardar"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>G"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Ficheiro/Gardar _como"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "Ficheiro/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Ficheiro/_Sa�r"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Opci�ns"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Opci�ns/Proba"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/A_xuda"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Axuda/_Acerca..."
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-#, fuzzy
-msgid "Configure"
-msgstr "Configurar as X"
-
-#: ../../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 ""
-
-#: ../../bootlook.pm_.c:121
-#, fuzzy
-msgid "Lilo/grub mode"
-msgstr "Modo de marcaci�n"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr ""
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 #, fuzzy
 msgid "NewStyle Monitor"
 msgstr "Monitor"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 #, fuzzy
 msgid "Traditional Monitor"
 msgstr "Mudar o monitor"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr ""
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr ""
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+#, fuzzy
+msgid "Lilo/grub mode"
+msgstr "Modo de marcaci�n"
+
+#: ../../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 ""
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+#, fuzzy
+msgid "Configure"
+msgstr "Configurar as X"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Modo de arrinque"
 
-#: ../../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 "Lanzar o sistema X-Window � iniciar"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Non, non quero login autom�tico"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Si, quero login autom�tico con este (usuario, escritorio)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr ""
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Por omisi�n"
-
-#: ../../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 "Aceptar"
 
-#: ../../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 "Cancelar"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "non se pode abrir /etc/inittab para lectura: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "non se pode abrir /etc/sysconfig/autologin para lectura: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "non se pode abrir /etc/inittab para 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 "Fallou a instalaci�n do LILO. Ocorreu o erro seguinte:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Crear"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Desmontar"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Borrar"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatar"
+#: ../../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 "Redimensionar"
+#: ../../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 minutos"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Punto de montaxe"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minuto"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Escribir /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d segundos"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Mudar a modo experto"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Faga primeiro unha copia de seguridade dos seus datos"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Mudar a modo normal"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "�Lea coidadosamente!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Restaurar a partir dun ficheiro"
+#: ../../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 ten pensado usar aboot, te�a coidado de deixar un espacio libre (2048\n"
+"sectores abondan) no inicio do disco"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Gardar nun ficheiro"
+#: ../../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 "Erro"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Axudante"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Restaurar a partir dun disquete"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Novo"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Gardar nun disquete"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Quitar"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Borrar todas"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Punto de montaxe"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Formatar todas"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Opci�ns"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Asignaci�n autom�tica"
+#: ../../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 "T�dalas partici�ns primarias est�n usadas"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Desmontar"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Non � posible engadir m�is partici�ns"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Montar"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Escolla a acci�n"
+
+#: ../../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 ""
-"Para ter m�is partici�ns, borre unha para poder crear unha partici�n "
-"estendida"
+"Ten unha partici�n FAT grande\n"
+"(xeralmente usada por Microsoft Dos/Windows).\n"
+"Acons�llase que primeiro a redimensione\n"
+"(prema nela, e logo en \"Redimensionar\")"
 
-#: ../../diskdrake.pm_.c:61
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Prema nunha partici�n"
+
+#: ../../diskdrake.pm_.c:240
 #, fuzzy
-msgid "Not enough space for auto-allocating"
-msgstr "Non hai espacio libre dabondo para asignar novas partici�ns"
+msgid "Please click on a media"
+msgstr "Prema nunha partici�n"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Refacer"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Prema nunha partici�n"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Escribir t�boa de partici�ns"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "M�is"
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detalles"
 
-#: ../../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 "mount fallou"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "Intercambio"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
 msgstr "Baleiro"
 
-#: ../../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 "Outros"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Tipos de sist. de ficheiros:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detalles"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Crear"
 
-#: ../../diskdrake.pm_.c:147
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Use ``%s'' no seu lugar"
+
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Borrar"
+
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Use ``Desmontar'' primeiro"
+
+#: ../../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 ""
-"Ten unha partici�n FAT grande\n"
-"(xeralmente usada por Microsoft Dos/Windows).\n"
-"Acons�llase que primeiro a redimensione\n"
-"(prema nela, e logo en \"Redimensionar\")"
+"� mudar o tipo da partici�n %s, perderanse t�dolos datos desta partici�n"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Faga primeiro unha copia de seguridade dos seus datos"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "�Onde desexa montar o dispositivo %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 "�Lea coidadosamente!"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Opci�ns do m�dulo:"
 
-#: ../../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 ten pensado usar aboot, te�a coidado de deixar un espacio libre (2048\n"
-"sectores abondan) no inicio do disco"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Te�a coidado: esta operaci�n � perigosa."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "Automonta-las unidades extra�bles"
 
-#: ../../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 "Erro"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Mudar o tipo de partici�n"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Punto de montaxe: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "�Qu� sistema de ficheiros desexa?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Dispositivo: "
+#: ../../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 "Letra de unidade DOS: %s (aproximaci�n)\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 "Tipo: "
+#: ../../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 "Nome: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Servidor"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Inicio: 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 "Tama�o: %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 sectores"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Cilindro %d a cilindro %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Escolla a acci�n"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Formatado\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Crear unha nova partici�n"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Non formatado\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Montado\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Mudar a modo experto"
 
-#: ../../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 "Mudar a modo normal"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Ficheiro(s) loopback: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Refacer"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Partici�n de arrinque por omisi�n\n"
-"    (para arrincar en MS-DOS, non para lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "�Continuar de calquera xeito?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Nivel %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Sa�r sen gardar"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Tama�o do bloque de datos %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "�Sa�r do programa sen gardar a t�boa de partici�ns?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "Discos RAID %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "�Desexa probar a configuraci�n?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Nome do ficheiro loopback: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Asignaci�n autom�tica"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Borrar todas"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "M�is"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Informaci�n do correo"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:267
+#, fuzzy
+msgid "Not enough space for auto-allocating"
+msgstr "Non hai espacio libre dabondo para asignar novas partici�ns"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "T�dalas partici�ns primarias est�n usadas"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Non � posible engadir m�is partici�ns"
+
+#: ../../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 ""
+"Para ter m�is partici�ns, borre unha para poder crear unha partici�n "
+"estendida"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Escribir t�boa de partici�ns"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "T�boa de partici�ns de rescate"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "T�boa de partici�ns de rescate"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "T�boa de partici�ns de rescate"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Automonta-las unidades extra�bles"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Seleccione un ficheiro"
+
+#: ../../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 ""
+"A t�boa de partici�ns de rescate non ten\n"
+"o mesmo tama�o.  �Continuar de calquera xeito?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Prema nunha partici�n"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Advertencia"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Tama�o: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Insira un disquete na unidade\n"
+"Perderanse t�dolos datos no disquete"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Xeometr�a: %s cilindros, %s cabezas, %s sectores\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Tentando recuperar a t�boa de partici�ns de rescate"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "Discos LVM %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Informaci�n do correo"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Tipo de t�boa de partici�ns: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Redimensionar"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "no bus %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Desprazar"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Montar"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatar"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Activar"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Engadir � RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Quitar do RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Modificar o RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Engadir � LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Quitar do RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Quitar do LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Modificar o RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Usar para loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Escolla a acci�n"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Crear unha nova partici�n"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Sector inicial: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Tama�o en MB: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Tipo de sist. de ficheiros: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Punto de montaxe: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Preferencia: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Formatando o ficheiro loopback %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Mudar o tipo de partici�n"
+
+#: ../../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 "�Onde desexa montar o ficheiro loopback %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 ""
+"Non se pode quitar o punto de montaxe porque esta partici�n estase a\n"
+"usar de loopback.\n"
+"Quite primeiro o loopback"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Calculando os l�mites do sistema de ficheiros FAT"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Redimensionando"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Esta partici�n non se pode redimensionar"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Deber�a facer unha copia de seguridade dos datos desta partici�n"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"� redimensionar a partici�n %s, perderanse t�dolos datos desta partici�n"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Escoller o novo tama�o"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Tama�o en MB: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "�A que disco desexa desprazala?"
+
+#: ../../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 que sector desexa desprazala?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Desprazando"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Desprazando partici�n..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Escolla un dos RAID para engadirlle"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "novo"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Escolla un dos LVM para engadirlle"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "�Nome do LVM?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Esta partici�n non pode usarse para loopback"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Nome do ficheiro loopback: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Nome real"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "O ficheiro xa est� a ser usado por outro loopback, escolla outro"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "O ficheiro xa existe. �Usalo?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "dispositivo"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "nivel"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "tama�o do bloque de datos"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Te�a coidado: esta operaci�n � perigosa."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "�Qu� tipo de particionamento quere?"
+
+#: ../../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 +1739,7 @@ msgstr ""
 "(nun cilindro > 1024). Se usa o LILO, non funcionar�, e se non o\n"
 "usa, non necesita /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"
@@ -1527,7 +1751,7 @@ msgstr ""
 "Se pensa usar o selector de SO de arrinque LILO, lembre engadir unha\n"
 "partici�n /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"
@@ -1538,282 +1762,233 @@ msgstr ""
 "partici�n /boot.\n"
 "Lembre polo tanto engadir unha partici�n /boot"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Use ``%s'' no seu lugar"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Use ``Desmontar'' primeiro"
-
-#: ../../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 ""
-"� mudar o tipo da partici�n %s, perderanse t�dolos datos desta partici�n"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "�Continuar de calquera xeito?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Sa�r sen gardar"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "�Sa�r do programa sen gardar a t�boa de partici�ns?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Mudar o tipo de partici�n"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "�Qu� sistema de ficheiros desexa?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Non pode usar ReiserFS para partici�ns m�is pequenas que 32MB"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "�Onde desexa montar o ficheiro loopback %s?"
-
-#: ../../diskdrake.pm_.c:538
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "�Onde desexa montar o dispositivo %s?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "�Escribirase � disco a t�boa de partici�ns da unidade %s!"
 
-#: ../../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 ""
-"Non se pode quitar o punto de montaxe porque esta partici�n estase a\n"
-"usar de loopback.\n"
-"Quite primeiro o loopback"
+"Necesitar� reiniciar o equipo para que a modificaci�n sexa tomada en conta"
 
-#: ../../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 "� formatar a partici�n %s, perderanse t�dolos datos desta partici�n"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Formatando"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatando o ficheiro 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 "Formatando a partici�n %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Logo de formatar t�dalas partici�ns,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "perderanse os datos nesas partici�ns"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Desprazar"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "�A que disco desexa desprazala?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sector"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid fallou"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "�A que sector desexa desprazala?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Non hai espacio libre dabondo para asignar novas partici�ns"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Desprazando"
+#: ../../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 "Desprazando partici�n..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Non hai espacio libre dabondo para asignar novas partici�ns"
 
-#: ../../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 "�Escribirase � disco a t�boa de partici�ns da unidade %s!"
-
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
+msgid "Copying %s"
 msgstr ""
-"Necesitar� reiniciar o equipo para que a modificaci�n sexa tomada en conta"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Calculando os l�mites do sistema de ficheiros FAT"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Resoluci�n: %s\n"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Redimensionando"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Dispositivo: "
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Esta partici�n non se pode redimensionar"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "Letra de unidade DOS: %s (aproximaci�n)\n"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Deber�a facer unha copia de seguridade dos datos desta partici�n"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Tipo: "
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Nome: "
+
+#: ../../diskdrake_interactive.pm_.c:954
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr ""
-"� redimensionar a partici�n %s, perderanse t�dolos datos desta partici�n"
+msgid "Start: sector %s\n"
+msgstr "Inicio: sector %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Escoller o novo tama�o"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Tama�o: %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 sectores"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Crear unha nova partici�n"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Cilindro %d a cilindro %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Sector inicial: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Formatado\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Tama�o en MB: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Non formatado\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Tipo de sist. de ficheiros: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Montado\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Preferencia: "
+#: ../../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 "Esta partici�n non pode usarse para loopback"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Ficheiro(s) 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 ""
+"Partici�n de arrinque por omisi�n\n"
+"    (para arrincar en MS-DOS, non para lilo)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Nome do ficheiro loopback: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Nivel %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "O ficheiro xa est� a ser usado por outro loopback, escolla outro"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Tama�o do bloque de datos %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "O ficheiro xa existe. �Usalo?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "Discos RAID %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Seleccione un ficheiro"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Nome do ficheiro 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 ""
-"A t�boa de partici�ns de rescate non ten\n"
-"o mesmo tama�o.  �Continuar de calquera xeito?"
 
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Advertencia"
-
-#: ../../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 ""
-"Insira un disquete na unidade\n"
-"Perderanse t�dolos datos no disquete"
 
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Tentando recuperar a t�boa de partici�ns de rescate"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "dispositivo"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "nivel"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "tama�o do bloque de datos"
-
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Escolla un dos RAID para engadirlle"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Tama�o: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "novo"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Xeometr�a: %s cilindros, %s cabezas, %s sectores\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Escolla un dos LVM para engadirlle"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "�Nome do LVM?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "Discos LVM %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Automonta-las unidades extra�bles"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Tipo de t�boa de partici�ns: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "T�boa de partici�ns de rescate"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "no bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Recargar"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Opci�ns: %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 "O formato %s de %s fallou"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Desco��cese o xeito de formatar %s de tipo %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "mount fallou"
+
+#: ../../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 "mount fallou: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "erro desmontando %s: %s"
@@ -1826,41 +2001,44 @@ msgstr "simple"
 msgid "server"
 msgstr "servidor"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Non pode usar JFS para partici�ns m�is pequenas que 16MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Non pode usar ReiserFS para partici�ns m�is pequenas que 32MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Os puntos de montaxe deben empezar por /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Xa existe unha partici�n co punto de montaxe %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Puntos de montaxe circulares %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 "Non pode usar un volume l�xico LVM para o punto de montaxe %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Este directorio deber�a permanecer dentro do sistema de ficheiros ra�z"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Necesita un sistema de ficheiros real (ext2, reiserfs) para este punto de "
 "montaxe\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Erro � abrir %s para escritura: %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"
@@ -1868,305 +2046,362 @@ msgstr ""
 "Ocorreu un erro - non se atopou ning�n dispositivo v�lido para crear novos "
 "sistemas de ficheiros. Verifique o seu equipo para ver a raz�n deste problema"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "�Non ten ningunha partici�n!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "Escolla a lingua que prefira para a instalaci�n e para o sistema."
-
-#: ../../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"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
-msgstr ""
-"Ten que aceptar os termos da licencia de enriba para continuar coa "
-"instalaci�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"
-"Por favor, prema \"Aceptar\" se concorda con eses termos.\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"\n"
-"Por favor, prema \"Rexeitar\" se non concorda con eses termos. A instalaci�n "
-"rematar� sen modificar a s�a configuraci�n actual."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Escolla a disposici�n do teclado que corresponda � seu na lista"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
+msgstr ""
 
-#: ../../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 ""
-"Se desexa ter outras linguas (� parte da que escolleu � principio da\n"
-"instalaci�n) dispo�ibles trala instalaci�n, esc�llaas na lista de enriba.\n"
-"Se quere seleccionar todas, s� ten que usar \"Todas\"."
 
-#: ../../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 ""
-"Escolla \"Instalar\" se non hai ningunha versi�n previa de Linux-Mandrake\n"
-"instalada ou se quere usar varios sistemas operativos.\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"
-"Escolla \"Actualizar\" se quere actualizar unha versi�n xa instalada de\n"
-"Linux-Mandrake.\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"
-"Dependendo do seu co�ecemento de GNU/Linux, pode escoller un dos seguintes\n"
-"niveis para instalar ou actualizar o seu sistema operativo Linux-Mandrake:\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* Recomendada: se nunca instalou un sistema operativo GNU/Linux, escolla\n"
-"isto. A instalaci�n ser� moi\n"
-"\t  sinxela e apenas se lle preguntar�n unhas poucas cuesti�ns.\n"
+"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: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* Personalizada: se ten familiaridade dabondo con GNU/Linux, pode escoller "
-"o uso principal (estaci�n de traballo,\n"
-"\t  servidor, desenvolvemento) do seu sistema. Ter� que responder a m�is "
-"cuesti�ns que na clase de instalaci�n\n"
-"\t  \"Recomendada\", polo que necesitar� saber como funciona GNU/Linux para "
-"escoller esta opci�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"
+"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* Experto: se ten un bo co�ecemento de GNU/Linux, pode escoller esta clase "
-"de instalaci�n. Do mesmo xeito que en\n"
-"\t  \"Personalizada\", poder� escoller o uso principal (estaci�n de "
-"traballo, servidor, desenvolvemento). Te�a\n"
-"\t  moito coidado � escoller este nivel. Vaille permitir facer unha "
-"instalaci�n altamente personalizada.\n"
-"\t  Responder algunhas cuesti�ns pode ser moi dif�cil se non ten un bo "
-"co�ecemento de GNU/Linux. Polo tanto, non\n"
-"\t  escolla esta clase de instalaci�n a menos que saiba o que est� a facer."
+"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:56
+#: ../../help.pm_.c:172
+#, fuzzy
 msgid ""
-"Select:\n"
+"You may now choose which services you wish to start at boot time.\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"
+"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"
+"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"
-"  - 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!"
+"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 ""
-"Seleccione:\n"
-"\n"
-"  - Personalizada: Se xa est� familiarizado con GNU/Linux, pode ent�n "
-"escoller\n"
-"    o uso principal da s�a m�quina. Mire embaixo para os detalles.\n"
-"\n"
+"Agora poder� escoller que servicios quere que sexan arrincados � inicio.\n"
+"Cando o seu rato pasa por riba dun elemento, unha pequena axuda aparecer�\n"
+"describindo o cometido do servicio.\n"
 "\n"
-"  - Experto: Isto sup�n que vostede manexa ben GNU/Linux e quere facer\n"
-"    unha instalaci�n altamente personalizada. Do mesmo xeito que coa\n"
-"    clase de instalaci�n \"Personalizada\", poder� escoller o uso do seu\n"
-"    sistema. Pero, por favor, �NON ESCOLLA ISTO A MENOS QUE SAIBA O QUE\n"
-"    EST� A FACER!"
+"Sexa especialmente coidadoso neste paso se pretende utiliza-la s�a m�quina\n"
+"coma un servidor: probablemente non querer� iniciar servicios que non "
+"precisa."
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:188
 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"
-"\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"
-"\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."
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
 msgstr ""
-"Agora ten que definir o uso da s�a m�quina. As escollas son:\n"
-"\n"
-"\t* Estaci�n de traballo: esta � a escolla ideal se pretende usar a s�a "
-"m�quina principalmente para o uso coti�n,\n"
-"\t  na oficina ou na casa.\n"
-"\n"
+"Linux xestiona a hora en GMT ou \"Hora do Meridiano de Greenwich\", e a\n"
+"traslada � hora local dependendo da zona que vostede escolla."
+
+#: ../../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* Desenvolvemento: se pretende usar a s�a m�quina principalmente para o "
-"desenvolvemento de software, esta � unha boa escolla.\n"
-"\t  Ter� unha completa colecci�n de software instalado para compilar, "
-"depurar e formatar c�digo fonte, ou\n"
-"\t  para crear paquetes de software.\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"
-"\t* Servidor: se pretende usar esta m�quina coma servidor, � a escolla "
-"correcta. Sexa un servidor de ficheiros (NFS\n"
-"\t  ou SMB), un servidor de impresi�n (estilo Unix ou Microsoft Windows), un "
-"servidor de autenticaci�n (NIS), un servidor\n"
-"\t  de bases de datos, etc... Como tal, non espere que haxa cousas como KDE, "
-"GNOME, etc. instaladas."
+"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:84
+#: ../../help.pm_.c:212
 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"
+"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"
-"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"
+" * 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"
-"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)."
+"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:108
+#: ../../help.pm_.c:255
+#, fuzzy
 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"
+"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 "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
-"\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"
-"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"
+"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 ""
 "Neste punto, ten que escoller onde quere instalar o sistema operativo\n"
-"Linux-Mandrake no disco duro. Se est� baleiro, ou se hai outro sistema\n"
+"Mandrake Linux no disco duro. Se est� baleiro, ou se hai outro sistema\n"
 "ocupando todo o espacio dispo�ible, ter� que particionalo. Basicamente,\n"
 "particionar un disco duro consiste en dividilo loxicamente para crear o\n"
-"espacio para instalar o seu novo sistema Linux-Mandrake.\n"
+"espacio para instalar o seu novo sistema Mandrake Linux.\n"
 "\n"
 "\n"
 "Como os efectos do proceso de particionamento son normalmente "
@@ -2190,829 +2425,452 @@ msgstr ""
 "use o axudante dispo�ible enriba. Dependendo da configuraci�n do seu disco\n"
 "duro, hai varias soluci�ns dispo�ibles:\n"
 "\n"
-"\t* Usar a partici�n existente: o axudante detectou unha ou m�is partici�ns "
-"de Linux existentes no seu disco duro. Se\n"
-"\t  quere mantelas, escolla esta opci�n.\n"
+"* Usar a partici�n existente: o axudante detectou unha ou m�is partici�ns de "
+"Linux existentes no seu disco duro. Se\n"
+"  quere mantelas, escolla esta opci�n.\n"
 "\n"
 "\n"
-"\t* Borrar o disco completo: Se quere borrar t�dolos datos e t�dalas "
+"* Borrar o disco completo: Se quere borrar t�dolos datos e t�dalas "
 "partici�ns existentes no disco duro e substitu�las\n"
-"\t  polo seu novo sistema Linux-Mandrake, pode escoller esta opci�n. Te�a "
+"  polo seu novo sistema Mandrake Linux, pode escoller esta opci�n. Te�a "
 "coidado con esta soluci�n, xa que non poder�\n"
-"\t  reverter o proceso despois de confirmar.\n"
+"  reverter o proceso despois de confirmar.\n"
 "\n"
 "\n"
-"\t* Usar o espacio libre na partici�n de Windows: se Microsoft Windows est� "
+"* Usar o espacio libre na partici�n de Windows: se Microsoft Windows est� "
 "instalado no seu disco duro e ocupa todo o espacio\n"
-"\t  dispo�ible, ten que crear espacio libre para o Linux. Para facelo, pode "
+"  dispo�ible, ten que crear espacio libre para o Linux. Para facelo, pode "
 "borrar a partici�n de\n"
-"\t  Microsoft Windows e os datos (mire \"Borrar o disco completo\" ou as "
+"  Microsoft Windows e os datos (mire \"Borrar o disco completo\" ou as "
 "soluci�ns do \"Modo experto\"), ou redimensionar\n"
-"\t  a partici�n de Microsoft Windows. O redimensionamento p�dese realizar "
-"sen perda de datos. Esta soluci�n �\n"
-"\t  a recomendada se quere usar Linux-Mandrake e Microsoft Windows no mesmo "
+"  a partici�n de Microsoft Windows. O redimensionamento p�dese realizar sen "
+"perda de datos. Esta soluci�n �\n"
+"  a recomendada se quere usar Mandrake Linux e Microsoft Windows no mesmo "
 "ordenador.\n"
 "\n"
 "\n"
-"\t  Antes de escoller esta soluci�n, advirta que o tama�o da s�a partici�n "
-"de Microsoft Windows\n"
-"\t  ser� m�is pequeno do que � agora. Isto significa que ter� menos espacio "
+"  Antes de escoller esta soluci�n, advirta que o tama�o da s�a partici�n de "
+"Microsoft Windows\n"
+"  ser� m�is pequeno do que � agora. Isto significa que ter� menos espacio "
 "libre en Microsoft Windows para\n"
-"\t  almacenar os seus datos ou instalar novo software.\n"
+"  almacenar os seus datos ou instalar novo software.\n"
 "\n"
 "\n"
-"\t* Modo experto: se quere particionar manualmente o seu disco duro, pode "
+"* Modo experto: se quere particionar manualmente o seu disco duro, pode "
 "escoller esta opci�n. Te�a coidado\n"
-"\t  � escoller esta soluci�n. � potente pero moi perigosa. Pode perder os "
-"seus datos moi facilmente. Polo tanto,\n"
-"\t  non a escolla a menos que saiba o que est� a facer."
+"  � escoller esta soluci�n. � potente pero moi perigosa. Pode perder os seus "
+"datos moi facilmente. Polo tanto,\n"
+"  non a escolla a menos que saiba o que est� a facer."
 
-#: ../../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"
-"\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"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\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"
+"    * \"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 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"
+" * \"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"
-"   * 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
+#: ../../help.pm_.c:350
 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"
+"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"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\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"
-"\"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"
+"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
 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 ""
-
-#: ../../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"
+"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"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
+"Please be patient."
 msgstr ""
 
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:384
 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:\")."
+"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:306
-msgid "Please be patient. This operation can take several minutes."
-msgstr "Por favor, sexa paciente. Esta operaci�n pode levar varios minutos."
-
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:391
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\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"
-"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"
-"\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
+"If you do not know what to choose, keep the default option."
 msgstr ""
 
-#: ../../help.pm_.c:335
-#, fuzzy
+#: ../../help.pm_.c:401
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\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"
-"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 ""
-"Agora pode selecciona-lo grupo de paquetes que desexa instalar\n"
-"ou actualizar.\n"
+"To partition the selected hard drive, you can use these options:\n"
 "\n"
-"DrakX comprobar� se ten espacio dabondo para instalalos todos. Se non,\n"
-"avisaralle diso. Se quere seguir a�nda as�, proceder� coa instalaci�n\n"
-"de t�dolos grupos seleccionados, pero deixar� alg�n de menor interese.\n"
-"� final da lista pode marca-la opci�n \"Selecci�n individual de paquetes\";\n"
-"neste caso ter� que percorrer m�is de 1000 paquetes..."
-
-#: ../../help.pm_.c:347
-msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\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"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\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"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\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"
-"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 ""
-"Se ten t�dolos CDs da lista superior, prema Aceptar. Se non ten\n"
-"ning�n deses CDs, prema Cancelar. Se s� faltan alg�ns dos CDs,\n"
-"desm�rqueos, e prema Aceptar."
-
-#: ../../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"
+" * \"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"
-"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 ""
-"Seleccione o porto correcto. Por exemplo, o porto\n"
-"COM1 en MS Windows ch�mase 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"
+" * \"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"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\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 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"
+" * Ctrl-d to delete a partition;\n"
 "\n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
+"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:406
+#: ../../help.pm_.c:460
 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 "Acenda o seu m�dem e escolla o correcto."
-
-#: ../../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 ""
-"Vostede pode agora introduci-las opci�ns de chamada. Se non est� seguro de\n"
-"que escribir, a informaci�n correcta pode obtela do seu ISP."
-
-#: ../../help.pm_.c:431
-#, fuzzy
-msgid ""
-"You may now configure your network device.\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"
-"   * 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"
+"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
+"\"Capacity\".\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"
+"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\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 ""
-"Introduza:\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"
-"  - Direcci�n IP: se non a co�ece, preg�ntelle � seu administrador de rede\n"
-"ou ISP.\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"
-"  - M�scara de Rede: \"255.255.255.0\" � normalmente unha boa elecci�n. Se\n"
-"non est� seguro, pregunte � seu administrador de rede ou ISP.\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"
-"  - IP autom�tica: Se a s�a rede usa o protocolo bootp ou dhcp, escolla\n"
-"esta opci�n. Neste caso, non � necesario ning�n valor en \"Direcci�n IP\".\n"
-"Se non est� seguro, pregunte � seu administrador de rede ou 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 ""
-"Se a s�a rede usa NIS, escolla \"Usar NIS\". Se non o sabe, preg�ntelle �\n"
-"seu administrador de rede."
-
-#: ../../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 ""
-"Agora pode introducir as opci�ns de marcado. Se non est� seguro do\n"
-"que escribir, a informaci�n correcta pode obtela do seu 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 ""
-"Se vai usar proxys, config�reos agora. Se non sabe se vai usar proxys,\n"
-"pregunte � seu administrador de rede ou � seu 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"
+" * \"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"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
-"Pode instalar paquetes de criptograf�a se xa configurou a s�a conexi�n a\n"
-"internet correctamente. Primeiro escolla un espello do que quere baixa-los\n"
-"paquetes, e ent�n escolla os paquetes que desexa instalar.\n"
-"\n"
-"Perc�tese de que ten que escolle-lo espello e os paquetes criptogr�ficos\n"
-"de acordo coa s�a lexislaci�n."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Agora pode seleccionar a zona horaria dependendo do lugar onde viva."
 
-#: ../../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"
-"\n"
-"\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"Agora pode escolle-la s�a zona horaria dependendo de onde viva.\n"
-"\n"
-"\n"
-"Linux xestiona a hora en GMT ou \"Hora do Meridiano de Greenwich\", e a\n"
-"traslada � hora local dependendo da zona que vostede escolla."
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
+msgstr "Por favor, sexa paciente. Esta operaci�n pode levar varios minutos."
 
-#: ../../help.pm_.c:479
+#: ../../help.pm_.c:494
 #, fuzzy
 msgid ""
-"You may now choose which services you want to start at boot time.\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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\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"
-"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 ""
-"Agora poder� escoller que servicios quere que sexan arrincados � inicio.\n"
-"Cando o seu rato pasa por riba dun elemento, unha pequena axuda aparecer�\n"
-"describindo o cometido do servicio.\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"
-"Sexa especialmente coidadoso neste paso se pretende utiliza-la s�a m�quina\n"
-"coma un servidor: probablemente non querer� iniciar servicios que non "
-"precisa."
-
-#: ../../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)."
+" * 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: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"
+"Escolla \"Instalar\" se non hai ningunha versi�n previa de Mandrake Linux\n"
+"instalada ou se quere usar varios sistemas operativos.\n"
 "\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\n"
 "\n"
+"Escolla \"Actualizar\" se quere actualizar unha versi�n xa instalada de\n"
+"Mandrake Linux.\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"
+"Dependendo do seu co�ecemento de GNU/Linux, pode escoller un dos seguintes\n"
+"niveis para instalar ou actualizar o seu sistema operativo Mandrake Linux:\n"
 "\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
+"* Recomendada: se nunca instalou un sistema operativo GNU/Linux, escolla\n"
+"isto. A instalaci�n ser� moi\n"
+"  sinxela e apenas se lle preguntar�n unhas poucas cuesti�ns.\n"
 "\n"
 "\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
+"* Personalizada: se ten familiaridade dabondo con GNU/Linux, pode escoller o "
+"uso principal (estaci�n de traballo,\n"
+"  servidor, desenvolvemento) do seu sistema. Ter� que responder a m�is "
+"cuesti�ns que na clase de instalaci�n\n"
+"  \"Recomendada\", polo que necesitar� saber como funciona GNU/Linux para "
+"escoller esta opci�n.\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 ""
+"* Experto: se ten un bo co�ecemento de GNU/Linux, pode escoller esta clase "
+"de instalaci�n. Do mesmo xeito que en\n"
+"  \"Personalizada\", poder� escoller o uso principal (estaci�n de traballo, "
+"servidor, desenvolvemento). Te�a\n"
+"  moito coidado � escoller este nivel. Vaille permitir facer unha "
+"instalaci�n altamente personalizada.\n"
+"  Responder algunhas cuesti�ns pode ser moi dif�cil se non ten un bo "
+"co�ecemento de GNU/Linux. Polo tanto, non\n"
+"  escolla esta clase de instalaci�n a menos que saiba o que est� a facer."
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:521
 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"
+"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"
-"   * 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"
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:534
 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"
+"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"
-"   * 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"
+"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:573
+#: ../../help.pm_.c:547
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\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"
-"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."
+"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:584
+#: ../../help.pm_.c:560
+#, 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"
-"\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."
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
 msgstr ""
+"Seleccione o porto correcto. Por exemplo, o porto\n"
+"COM1 en MS Windows ch�mase ttyS0 en GNU/Linux."
 
-#: ../../help.pm_.c:591
-#, 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"
+#: ../../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 ""
-"Agora pode introduci-lo contrasinal do superusuario para o seu sistema\n"
-"Linux Mandrake. O contrasinal deber� ser tecleado d�as veces para\n"
-"comprobar que �mbolos dous son id�nticos.\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"
-"O superusuario (root) � o administrador do sistema, e � o �nico usuario\n"
-"� que se lle permete modifica-la configuraci�n do sistema. �Por tanto,\n"
-"escolla o contrasinal con coidado! O uso non autorizado da conta de root\n"
-"pode ser extremadamente perigoso para a integridade do sistema e os seus\n"
-"datos, e para os outros sistemas conectados a el. O contrasinal deber�a\n"
-"ser unha mestura de caracteres alfanum�ricos e de 8 caracteres de longo,\n"
-"polo menos. NUNCA debe ser anotado. Non escolla un contrasinal longo\n"
-"de m�is ou complicado: ten que ser capaz de lembralo sen moito esforzo."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Para ter un sistema m�is seguro, deber�a seleccionar \"Usar ficheiro shadow"
-"\"\n"
-"e \"Usar contrasinais MD5\"."
-
-#: ../../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 a s�a rede usa NIS, escolla \"Usar NIS\". Se non o sabe, preg�ntelle �\n"
-"seu administrador de rede."
 
-# Non � realmente fuzzy, � s� para revisala. :)
-#: ../../help.pm_.c:617
-#, fuzzy
+#: ../../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 ""
-"Pode agora crear unha ou varias contas de usuarios �normais�, como\n"
-"contraposici�n � conta de usuario �privilexiado�, root. Vostede\n"
-"pode crear unha ou m�is contas para cada persoa � que vostede queira\n"
-"permitirlle o uso do ordenador. Note que cada conta de usuario ter�\n"
-"as s�as preferencias (ambiente gr�fico, configuraci�n dos programas, etc.)\n"
-"e o seu propio directorio (chamado \"home\"), no que se almacenan esas\n"
-"preferencias.\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"
-"Antes que nada, �cree unha conta para vostede mesmo! A�nda se � a �nica\n"
-"persoa que vai usa-la m�quina, NON debe entrar como root para o uso\n"
-"diario do sistema: � un risco de seguridade elevado. Facer que o\n"
-"sistema fique totalmente inoperante, pode ser moitas veces causa dun\n"
-"simple erro � teclear.\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"
-"Polo tanto, debe entrar no sistema usando a conta de usuario normal que\n"
-"vai crear aqu�, e entrar como root s� para as tarefas de administraci�n\n"
-"que o precisen."
-
-#: ../../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
-#, fuzzy
-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 ""
-"Debe indicar onde desexa po�er a informaci�n\n"
-"necesaria para arrincar 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"
-"A menos que sepa exactamente o que fai, elixa sempre\n"
-"\"Primeiro sector do disco (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 ""
-"A menos que vostede saiba que � outra especificamente, a escolla habitual �\n"
-"\"/dev/hda\" (a unidade mestra da canle primaria) ou \"/dev/sda\" (primeiro\n"
-"disco 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 (O LInux LOader) e Grub son cargadores de arrinque: poden arrincar\n"
 "Linux ou outro sistema operativo presente no seu ordenador.\n"
@@ -3027,391 +2885,225 @@ msgstr ""
 "poidendo borrar as entradas correspondentes. Pero neste caso, precisar�\n"
 "un disquete de arrinque para poder usalos."
 
-#: ../../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"
-"\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 ""
-"As opci�ns principais do LILO e do grub son:\n"
-"  - Dispositivo de arrinque: Establece o nome do dispositivo (p.ex unha\n"
-"partici�n dun disco duro) que cont�n o sector de arrinque. A menos que\n"
-"saiba espec�ficamente que � outro, escolla \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Retardo antes de arrinca-la imaxe por omisi�n: Indica o n�mero de\n"
-"d�cimas de segundo que agardar� o cargador de inicio antes de arrincar a\n"
-"primeira imaxe. Isto � �til nos sistemas que arrincan inmediatamente do\n"
-"disco duro tras activa-lo teclado. O boot loader non agarda se o \"retardo"
-"\"\n"
-"� cero ou non se indica.\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"Debe indicar onde desexa po�er a informaci�n\n"
+"necesaria para arrincar Linux.\n"
 "\n"
 "\n"
-"  - Modo de v�deo: Indica o modo de texto VGA que ser� utilizado �\n"
-"arrincar. Os seguintes valores est�n dispo�ibles:\n"
-"    * normal: escoller modo de texto normal 80x25.\n"
-"    * <n�mero>: usa-lo modo de texto correspondente."
+"A menos que sepa exactamente o que fai, elixa sempre\n"
+"\"Primeiro sector do disco (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"
+"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"
-"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"
+"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"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"hold this information.\n"
 "\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \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"
-" \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"
-"\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
-#, fuzzy
+#: ../../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 ""
-"LILO (O LInux LOader) e Grub son cargadores de arrinque: poden arrincar\n"
-"Linux ou outro sistema operativo presente no seu ordenador.\n"
-"Normalmente, estes outros sitemas son detectados correctamente e "
-"instalados.\n"
-"Se non � o caso, pode engadir unha entrada a man nesta pantalla. Sexa\n"
-"coidadoso na escolla dos par�metros correctos.\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"
-"Tam�n pode non querer dar acceso a eses outros sitemas operativos a "
-"calquera,\n"
-"poidendo borrar as entradas correspondentes. Pero neste caso, precisar�\n"
-"un disquete de arrinque para poder usalos."
-
-#: ../../help.pm_.c:805
-#, 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."
-msgstr ""
-"As opci�ns principais do LILO e do grub son:\n"
-"  - Dispositivo de arrinque: Establece o nome do dispositivo (p.ex unha\n"
-"partici�n dun disco duro) que cont�n o sector de arrinque. A menos que\n"
-"saiba espec�ficamente que � outro, escolla \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Retardo antes de arrinca-la imaxe por omisi�n: Indica o n�mero de\n"
-"d�cimas de segundo que agardar� o cargador de inicio antes de arrincar a\n"
-"primeira imaxe. Isto � �til nos sistemas que arrincan inmediatamente do\n"
-"disco duro tras activa-lo teclado. O boot loader non agarda se o \"retardo"
-"\"\n"
-"� cero ou non se indica.\n"
-"\n"
-"\n"
-"  - Modo de v�deo: Indica o modo de texto VGA que ser� utilizado �\n"
-"arrincar. Os seguintes valores est�n dispo�ibles:\n"
-"    * normal: escoller modo de texto normal 80x25.\n"
-"    * <n�mero>: usa-lo modo de texto correspondente."
-
-#: ../../help.pm_.c:818
-#, 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"
-"\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 ""
-"Agora � o momento de configura-lo sistema de fiestras X, que �\n"
-"o centro da interface gr�fica de Linux. Para iso necesita configura-\n"
-"-la s�a tarxeta de v�deo e o seu monitor. A maior�a deses pasos est�n\n"
-"automatizados, as� que probablemente a s�a tarea limitarase a verificar\n"
-"o que se fixo e aceptar a configuraci�n proposta :-)\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"
-"Cando a configuraci�n estea rematada, lanzarase o servidor X\n"
-"(a menos que vostede lle pida a DrakX que non), de xeito que\n"
-"poida comprobar se todo est� ben e corresponde � que desexa.\n"
-"Se non, pode voltar atr�s e troca-la configuraci�n; tantas\n"
-"veces como sexa necesario."
-
-#: ../../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 algo vai mal coa configuraci�n de X, use estas opci�ns para configurar\n"
-"correctamente o sistema X Window."
-
-#: ../../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 prefire usar un login gr�fico, escolla \"Si\". Doutro xeito,\n"
-"seleccione \"Non\"."
 
-#: ../../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."
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"O sistema vaise reiniciar.\n"
-"\n"
-"Despois de reiniciar, o seu novo sistema Linux Mandrake cargarase\n"
-"automaticamente. Se vostede quere iniciar outro sistema operativo que xa\n"
-"exista, lea as instrucci�ns adicionais."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Escoller a lingua"
 
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Clase de instalaci�n"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Detectar discos duros"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Configurar o rato"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Escoller teclado"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
 
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Sistemas de ficheiros"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formatar partici�ns"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Seleccionar paquetes"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Instalar sistema"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Contrasinal de root"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Engadir usuario"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Configurar a rede"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Resume"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Configurar servicios"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Crear disquete de arrinque"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Cargador de arrinque"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Configurar as X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Sa�r da instalaci�n"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3426,20 +3118,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 ""
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Insira un disquete formatado con FAT na unidade %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''"
@@ -3447,30 +3139,20 @@ msgstr ""
 "Para usar esta selecci�n de paquetes gardada, arrinque a instalaci�n con "
 "``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Erro lendo o ficheiro $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Erro lendo o ficheiro %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 "Aceptar"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Probe o seu rato"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Para activar o rato,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "�MOVA A RODA!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3480,7 +3162,7 @@ msgstr ""
 "Alg�n hardware do seu ordenador necesita controladores ``propietarios''\n"
 "para funcionar. Pode atopar m�is informaci�n sobre eles en: %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"
@@ -3490,11 +3172,11 @@ msgstr ""
 "Para iso, faga unha partici�n (ou prema nunha que xa exista).\n"
 "Ent�n escolla a acci�n ``Punto de montaxe'', e as�cieo a `/'"
 
-#: ../../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 "Debe ter unha partici�n de intercambio"
 
-#: ../../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"
@@ -3504,55 +3186,60 @@ msgstr ""
 "\n"
 "�Desexa continuar de calquera xeito?"
 
-#: ../../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 "Debe ter unha partici�n de intercambio"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Usar espacio libre"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Non hai espacio libre dabondo para asignar novas partici�ns"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Usar partici�n existente"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Non hai ningunha partici�n existente para usar"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Usar a partici�n de Windows para loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "�Que partici�n desexa usar para Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Escolla os tama�os"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Tama�o da partici�n ra�z en MB: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Tama�o da partici�n de intercambio en MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Usar o espacio libre da partici�n de Windows"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "�Que partici�n desexa redimensionar?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Calculando os l�mites do sistema de ficheiros 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"
@@ -3561,13 +3248,13 @@ msgstr ""
 "O redimensionador de FAT non � capaz de manexar a s�a partici�n,\n"
 "ocorreu o seguinte erro: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "A partici�n de Windows est� demasiado fragmentada, execute primeiro o "
 "``defrag''"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3586,21 +3273,21 @@ msgstr ""
 "Tam�n � aconsellable facer unha copia de seguridade dos seus datos.\n"
 "Cando estea seguro, prema Aceptar."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "�Que tama�o desexa manter para o Windows en"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "partici�n %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "O redimensionamento da FAT fallou: %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)"
@@ -3608,34 +3295,34 @@ msgstr ""
 "Non hai partici�ns FAT para redimensionar ou para usar como loopback (ou non "
 "hai espacio libre dabondo)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Borrar o disco completo"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Borrar 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 ""
 "Ten m�is dunha unidade de disco duro, �en cal delas desexa instalar 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 ""
 "Perderanse TODAS as partici�ns existentes e os seus datos na unidade %s"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Particionamento de disco personalizado"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Usar fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3644,28 +3331,28 @@ msgstr ""
 "Pode agora particionar %s.\n"
 "Cando remate, non esqueza gravar usando `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Non ten espacio libre dabondo na partici�n de Windows"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "Non se pode atopar espacio para a instalaci�n"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "O axudante de particionamento do DrakX atopou as seguintes soluci�ns:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "O particionamento fallou: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Activando a rede"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Desactivando a rede"
 
@@ -3677,12 +3364,12 @@ msgstr ""
 "Ocorreu un erro, e o programa non sabe como manexalo de\n"
 "maneira limpa. Contin�e � seu propio risco."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Punto de montaxe %s duplicado"
 
-#: ../../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"
@@ -3694,16 +3381,16 @@ msgstr ""
 "Comprobe o cdrom nun ordenador xa instalado usando \"rpm -qpl Mandrake/RPMS/"
 "*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Benvido a %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Ningunha disqueteira dispo�ible"
 
-#: ../../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"
@@ -3717,32 +3404,32 @@ msgstr "Escolla o tama�o que quere instalar"
 msgid "Total size: "
 msgstr "Tama�o 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�n: %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 "Tama�o: %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 "Escolla os paquetes que desexa instalar"
 
-#: ../../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 "Instalar"
 
-#: ../../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 "Instalando"
 
@@ -3750,7 +3437,7 @@ msgstr "Instalando"
 msgid "Please wait, "
 msgstr "Agarde, por favor, "
 
-#: ../../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 restante "
 
@@ -3759,21 +3446,21 @@ msgid "Total time "
 msgstr "Tempo total "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Preparando a instalaci�n"
 
-#: ../../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 "Instalando o paquete %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 "�Seguir adiante?"
 
-#: ../../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 "Houbo un erro � ordenar os paquetes:"
 
@@ -3781,29 +3468,33 @@ msgstr "Houbo un erro � ordenar os paquetes:"
 msgid "Use existing configuration for X11?"
 msgstr "�Usar a configuraci�n existente para 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 ""
 "O seu sistema ten poucos recursos. Pode que te�a alg�n problema\n"
-"instalando Linux-Mandrake. Se iso acontece, pode tentar unha instalaci�n\n"
+"instalando Mandrake Linux. Se iso acontece, pode tentar unha instalaci�n\n"
 "en modo texto.  Para iso, prema 'F1' cando arrinque o CDROM, e escriba\n"
 "'text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Clase de instalaci�n"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Escolla unha das seguintes clases de instalaci�n:"
 
-#: ../../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 "O tama�o total dos grupos que seleccionou � aproximadamente %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"
@@ -3818,7 +3509,7 @@ msgstr ""
 "Unha porcentaxe baixa instalar� s� os paquetes m�is importantes;\n"
 "unha porcentaxe dun 100%% instalar� t�dolos paquetes seleccionados."
 
-#: ../../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"
@@ -3835,85 +3526,69 @@ msgstr ""
 "Unha porcentaxe baixa instalar� s� os paquetes m�is importantes;\n"
 "unha porcentaxe de %d%% instalar� t�dolos paquetes posibles."
 
-#: ../../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 "Vostede poder� escollelos m�is especificamente na seguinte etapa."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Porcentaxe de paquetes a instalar"
 
-#: ../../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�n dos grupos de paquetes"
 
-#: ../../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�n individual de paquetes"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Expandir �rbore"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Pechar �rbore"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Mudar entre lista completa e ordenada por grupos"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Tama�o total: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Paquete err�neo"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nome: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Importancia: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Tama�o 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 ""
 "Non pode seleccionar este paquete xa que non hai espacio dabondo para "
 "instalalo"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Vanse instalar os seguintes paquetes"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Vanse eliminar os seguintes paquetes"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Non pode seleccionar/deseleccionar este paquete"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Este � un paquete obrigatorio, non se pode 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 "Non pode deseleccionar este paquete. Xa est� instalado"
 
-#: ../../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?"
@@ -3921,24 +3596,43 @@ msgstr ""
 "Este paquete ten que ser actualizado\n"
 "�Est� seguro de que quere deseleccionalo?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Non pode deseleccionar este paquete. Ten que ser actualizado"
 
-#: ../../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 "Gardar nun disquete"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "Gardar a selecci�n de paquetes"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "Desinstalar"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Estimando"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Por favor, agarde, preparando a instalaci�n"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d paquetes"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -3970,15 +3664,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 "Aceptar"
 
-#: ../../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 "Rexeitar"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -3992,7 +3686,7 @@ msgstr ""
 "Por favor, insira o Cd-Rom etiquetado \"%s\" na unidade e prema Aceptar. Se "
 "non o ten, prema Cancelar para omitir a instalaci�n deste Cd-Rom."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Houbo un erro � instalar os paquetes:"
 
@@ -4000,34 +3694,21 @@ msgstr "Houbo un erro � instalar os paquetes:"
 msgid "An error occurred"
 msgstr "Ocorreu un erro"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Escolla a lingua que desexe usar."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "Pode escoller outras linguas que estar�n dispo�ibles trala instalaci�n"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Todas"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Acordo da licencia"
 
-#: ../../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"
@@ -4081,7 +3762,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"
@@ -4118,7 +3799,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"
@@ -4138,103 +3819,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 "Teclado"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Escolla a disposici�n do seu teclado."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "Esta � a lista completa de teclados dispo�ibles"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Clase de instalaci�n"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "�Qu� clase de instalaci�n desexa?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Instalar/Actualizar"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "�� isto unha instalaci�n ou unha actualizaci�n?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Recomendada"
 
-#: ../../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 "Experto"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Actualizaci�n"
 
-#: ../../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 "Escolla o seu tipo de rato."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Porto do rato"
 
-#: ../../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 "Escolla o porto serie onde est� conectado o seu rato."
 
-#: ../../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 "Configurando tarxetas 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 "Configurando o 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 "ningunha partici�n dispo�ible"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Examinando as partici�ns para atopar os puntos de montaxe"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Seleccione os puntos de montaxe"
 
-#: ../../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"
@@ -4252,7 +3929,7 @@ msgstr ""
 "\n"
 "�Concorda coa perda de t�dalas partici�ns?\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!"
@@ -4260,52 +3937,63 @@ msgstr ""
 "O DiskDrake non puido ler correctamente a t�boa de partici�ns.\n"
 "�Contin�e � seu propio risco!"
 
-#: ../../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 "Elixa as partici�ns que desexa formatar"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Partici�n ra�z"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "�Cal � a partici�n ra�z (/) do seu 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 ""
 "Necesita reiniciar o equipo para que a modificaci�n da t�boa\n"
 "de partici�ns se tome en conta"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Elixa as partici�ns que desexa formatar"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "�Comprobar os bloques err�neos?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Formatando as partici�ns"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Creando e formatando o ficheiro %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "Non hai espacio de intercambio dabondo para finalizar a instalaci�n,\n"
 "por favor, engada alg�n"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Buscando os paquetes dispo�ibles"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Atopando os paquetes para actualizar"
 
-#: ../../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)"
@@ -4313,30 +4001,60 @@ msgstr ""
 "O seu sistema non ten espacio libre dabondo para a instalaci�n ou "
 "actualizaci�n (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Completo (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "M�nimo (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Recomendado (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../../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 "Restaurar a partir dun disquete"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Loading from floppy"
+msgstr "Restaurar a partir dun disquete"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Package selection"
+msgstr "Selecci�n dos grupos de paquetes"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "Insira un disquete na unidade %s"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Gardar nun disquete"
+
+#: ../../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"
@@ -4346,12 +4064,12 @@ msgstr ""
 "Se non ten ning�n deses CDs, prema Cancelar.\n"
 "Se s� faltan alg�ns dos CDs, desm�rqueos, e prema Aceptar."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom etiquetado \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4360,11 +4078,21 @@ msgstr ""
 "Instalando o paquete %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Configuraci�n trala instalaci�n"
 
-#: ../../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 "Insira un disquete na unidade %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Insira un disquete baleiro na unidade %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4435,94 +4163,141 @@ 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 "Escoller un espello do que coller os paquetes"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Contactando co espello para obter a lista dos paquetes dispo�ibles"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Escolla os paquetes que desexa instalar."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "�Cal � a s�a zona horaria?"
 
-#: ../../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 "�O reloxo interno do seu ordenador usa a hora 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 remoto"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Sen impresora"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Resume"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Rato"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: ../../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 "Impresora"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "Tarxeta RDSI"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Tarxeta de son"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "Tarxeta de TV"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "�Que sistema de impresi�n desexa usar?"
+#: ../../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 "Usar NIS"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+#, fuzzy
+msgid "Local files"
+msgstr "Impresora local"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Contrasinal de root"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Sen contrasinal"
 
-#: ../../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 ""
 "Este contrasinal � demasiado simple (ten que ter polo menos %d caracteres)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Usar NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autenticaci�n"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "p�xinas amarelas (yp)"
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "Autenticaci�n"
+
+#: ../../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 "Servidor"
+
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "Autenticaci�n NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "Dominio 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
 #, fuzzy
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -4551,19 +4326,19 @@ msgstr ""
 "de Mandrake, facendo as� moito m�is f�cil a recuperaci�n no caso de fallo\n"
 "grave do sistema. �Desexa crear un disco de arrinque para o seu sistema?"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Primeira unidade de disquete"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Segunda unidade de disquete"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Omitir"
 
-#: ../../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 "
@@ -4587,32 +4362,40 @@ msgstr ""
 "de Mandrake, facendo as� moito m�is f�cil a recuperaci�n no caso de fallo\n"
 "grave do sistema. �Desexa crear un disco de arrinque para o seu sistema?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Desculpe, pero non hai ningunha disqueteira dispo�ible"
 
-#: ../../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 "Escolla a disqueteira que quere usar para crear o disco de arranque"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Insira un disquete na unidade %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Creando o disco de arrinque"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Preparando o cargador de arrinque"
 
-#: ../../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 "�Desexa usar 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?"
@@ -4620,51 +4403,54 @@ msgstr ""
 "Erro instalando aboot, \n"
 "�probar a forzar a instalaci�n mesmo se iso destr�e a primeira partici�n?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Cargador de arrinque"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "A instalaci�n do xestor de arrinque fallou. Ocorreu o seguinte erro:"
 
-#: ../../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 "Baixo"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Medio"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Alto"
 
-#: ../../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 "Escola o nivel de seguridade"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "�Quere realmente xerar un disquete de instalaci�n para replicar 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 "Insira un disquete baleiro na unidade %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 "Creando un disquete de auto-instalaci�n"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -4674,34 +4460,34 @@ msgstr ""
 "\n"
 "�Desexa realmente sa�r agora?"
 
-#: ../../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 ""
 "Noraboa, a instalaci�n rematou.\n"
 "Quite o disco de arrinque da unidade e prema [enter] para reiniciar.\n"
 "\n"
 "Para informaci�n sobre parches dispo�ibles para esta versi�n\n"
-"de Linux Mandrake, consulte o ficheiro de erratas dispo�ibles en\n"
-"http://www.linux-mandrake.com.\n"
+"de Mandrake Linux, consulte o ficheiro de erratas dispo�ibles en\n"
+"http://www.mandrakelinux.com.\n"
 "\n"
 "Para informaci�n sobre a configuraci�n do seu sistema, despois\n"
 "da instalaci�n, hai un cap�tulo na Gu�a do Usuario Oficial\n"
-"de Linux Mandrake."
+"de Mandrake Linux."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Xerar disquete de auto-instalaci�n"
 
-#: ../../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"
@@ -4715,41 +4501,58 @@ msgstr ""
 "\n"
 "Pode preferir realizar novamente a instalaci�n.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automatizada"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Reproducir"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Gardar a selecci�n de paquetes"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Instalaci�n de Linux-Mandrake %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Instalaci�n de 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 elementos  |  <Space> escoller  |  <F12> seguinte "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "falla o kdesu"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Escolla a acci�n"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Expandir �rbore"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Pechar �rbore"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Mudar entre lista completa e ordenada por grupos"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -4775,268 +4578,292 @@ msgstr "�A s�a escolla? (por omisi�n %s)"
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "�A s�a escolla? (por omisi�n %s, escriba 'none' para ningunha)"
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "Checo (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 "Alem�n"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Teclado dvorak"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "Espa�ol"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Finland�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 "Noruegu�s"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Sueco"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Brit�nico"
 
-#: ../../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 "Estadounidense"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "Iraniano"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armenio (antigo)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armenio (m�quina de escribir)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Armenio (fon�tico)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaian� (lat�n)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaian� (cir�lico)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "B�lgaro"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasileiro (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Bielorruso"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "Su�zo (alem�n)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "Su�zo (franc�s)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "Checo (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "Checo (Programadores)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Alem�n (sen teclas acentuadas)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Dinamarqu�s"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak (EUA)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak (Noruegu�s)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estonio"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Xeorxiano (\"ruso\")"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Xeorxiano (\"latino\")"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Grego"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "H�ngaro"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Israel�"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Israel� (Fon�tico)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iraniano"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Island�s"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Xapon�s de 106 teclas"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 #, fuzzy
 msgid "Korean keyboard"
 msgstr "Brit�nico"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latinoamericano"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Macedonio"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Holand�s"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituano AZERTY (antigo)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituano AZERTY (novo)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituano \"ringleira de n�meros\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituano \"fon�tico\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Localizaci�n"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Macedonio"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Holand�s"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Polaco (disposici�n qwerty)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Polaco (disposici�n 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 "Canadiano (Qu�bec)"
 
-#: ../../keyboard.pm_.c:193
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "Ruso (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Sueco"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "Ruso (Yawerty)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "Ruso (Yawerty)"
+
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Eslovaco (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Eslovaco (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Eslovaco (Programadores)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbaian� (cir�lico)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Teclado Thai"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Teclado Thai"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turco (tradicional modelo \"F\")"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turco (moderno modelo \"Q\")"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ucra�no"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "Estadounidense (internacional)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"ringleira de n�meros\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Iugoslavo (lat�n/cir�lico)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Puntos de montaxe circulares %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Quitar primeiro os volumes l�xicos\n"
 
@@ -5148,170 +4975,219 @@ msgstr "ning�n"
 msgid "No mouse"
 msgstr "Ning�n rato"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Probe o seu rato"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Para activar o rato,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "�MOVA A RODA!"
+
+#: ../../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 "Finalizar"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Seguinte ->"
 
-#: ../../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 "�� isto correcto?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Configuraci�n de Internet"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Conectar � Internet"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "�Quere probar agora a conexi�n � Internet?"
+#: ../../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 ""
+"O xeito m�is habitual de conectar con adsl � con pppoe.\n"
+"Algunhas conexi�ns usan pptp, e algunhas usan dhcp.\n"
+"Se non o sabe con certeza, escolla 'usar pppoe'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Probando a conexi�n..."
+#: ../../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 "O sistema est� conectado � Internet."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "usar dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr ""
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "usar pppoe"
+
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "usar 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 ""
-"Semella que o sistema non est� conectado � internet.\n"
-"Probe reconfigurando a conexi�n."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Configuraci�n da rede"
-
-#: ../../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�n da RDSI"
+"�Que cliente dhcp desexa usar?\n"
+"Por omisi�n � o 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 ""
-"Seleccione o seu provedor.\n"
-" Se non est� na lista, escolla 'Unlisted'"
+"Non se detectou ning�n adaptador de rede ethernet no seu sistema.\n"
+"Non se pode configurar este tipo de conexi�n."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Configuraci�n da conexi�n"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Escolla a interface de rede"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Encha ou marque os campos de embaixo"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Escolla o adaptador de rede que desexa usar para conectar � Internet"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ da tarxeta"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "non se atopou ningunha tarxeta de rede"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Memoria da tarxeta (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Configurando a rede"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "E/S da tarxeta"
+#: ../../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 ""
+"Introduza o nome da s�a m�quina se o co�ece.\n"
+"Alg�ns servidores DHCP precisan o nome da m�quina para funcionar.\n"
+"Este nome debe ser completamente cualificado,\n"
+"como ``mi�amaquina.meulab.mi�acomp.es''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "E/S_0 da tarxeta"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Nome de m�quina"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "E/S_1 da tarxeta"
+#: ../../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 "Axudante da configuraci�n de rede"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "O seu n�mero de tel�fono persoal"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "M�dem RDSI externo"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Nome do provedor (p.ex provider.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Tarxeta RDSI interna"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "N�mero de tel�fono do provedor"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "�Que tipo de conexi�n RDSI ten?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Dns 1 do provedor"
+#: ../../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 do provedor"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "�Detectouse unha configuraci�n de firewall!"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Modo de marcaci�n"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "�Detectouse unha configuraci�n de firewall!"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Login da conta (nome de usuario)"
+#: ../../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�n da RDSI"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Contrasinal da conta"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Seleccione o seu provedor.\n"
+" Se non est� na lista, escolla 'Unlisted'"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Protocolo de arrinque"
 
-#: ../../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 "Resto do mundo"
 
-#: ../../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 ""
 "Resto do mundo \n"
 " sen canle-D (li�as dedicadas)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "�Qu� protocolo desexa usar?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "�Qu� tipo de tarxeta ten?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Non sei"
 
-#: ../../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"
@@ -5324,19 +5200,19 @@ msgstr ""
 "\n"
 "Se ten unha tarxeta PCMCIA, ten que co�ecer a irq e a e/s da tarxeta.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Abortar"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "�Cal � a sua tarxeta RDSI?"
 
-#: ../../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."
@@ -5344,109 +5220,60 @@ msgstr ""
 "Detectouse unha Tarxeta RDSI PCI, pero se desco�ece o tipo. Seleccione unha "
 "tarxeta PCI na seguinte pantalla."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "Non se atopou ningunha tarxeta RDSI PCI. Seleccione unha na pr�xima pantalla."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Non se detectou ning�n adaptador de rede ethernet no seu sistema.\n"
-"Non se pode configurar este tipo de conexi�n."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Escolla a interface de rede"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr "Escolla o adaptador de rede que desexa usar para conectar � Internet"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Interface de rede"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"�Concorda?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Est� a piques de se reiniciar o dispositivo de rede:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "Configuraci�n de ADSL"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "�Desexa que a conexi�n se inicie � arrincar?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Escolla o porto serie onde est� conectado o seu m�dem."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Opci�ns de chamada"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Nome da conexi�n"
 
-#: ../../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�fono"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "ID do login"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autenticaci�n"
+#: ../../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 "Baseado nun script"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Baseado nun terminal"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Nome de dominio"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Primeiro 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 "Segundo Servidor DNS (opcional)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"Est� a piques de se reiniciar o dispositivo de rede $netc->{NET_DEVICE}. "
-"�Concorda?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5454,7 +5281,7 @@ msgstr ""
 "\n"
 "Pode desconectar ou reconfigurar a s�a conexi�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."
@@ -5462,11 +5289,11 @@ msgstr ""
 "\n"
 "Pode reconfigurar a s�a conexi�n."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Est� neste intre conectado � internet."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5474,99 +5301,53 @@ msgstr ""
 "\n"
 "Pode conectar � Internet ou reconfigurar a s�a conexi�n."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Non est� neste intre conectado � Internet."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Conectar � Internet"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Desconectar de Internet"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Configurar a conexi�n de rede (LAN ou Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Conexi�n e configuraci�n de Internet"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Axudante da configuraci�n de rede"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "M�dem RDSI externo"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Tarxeta RDSI interna"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "�Que tipo de conexi�n RDSI ten?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Conectar � 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'"
+#: ../../network/netconnect.pm_.c:96
+#, fuzzy, c-format
+msgid "We are now going to configure the %s connection."
 msgstr ""
-"O xeito m�is habitual de conectar con adsl � con pppoe.\n"
-"Algunhas conexi�ns usan pptp, e algunhas usan dhcp.\n"
-"Se non o sabe con certeza, escolla 'usar pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "usar dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "usar pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "usar pptp"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "Est� a piques de se reiniciar o dispositivo de rede %s. �Concorda?"
+"\n"
+"Pode desconectar ou reconfigurar a s�a conexi�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 ""
-"�Que cliente dhcp desexa usar?\n"
-"Por omisi�n � o dhcpcd"
+"\n"
+"Pode desconectar ou reconfigurar a s�a conexi�n."
 
-#: ../../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 "Configuraci�n da rede"
 
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "�Desexa reiniciar a rede?"
-
-#: ../../netconnect.pm_.c:904
-#, fuzzy, c-format
-msgid ""
-"A problem occured while restarting the network: \n"
-"\n"
-"%s"
-msgstr "�Desexa reiniciar a rede?"
-
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -5577,7 +5358,7 @@ msgstr ""
 "Prema Aceptar para manter a configuraci�n, ou Cancelar para reconfigurar a "
 "conexi�n de rede e Internet.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 #, fuzzy
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
@@ -5590,72 +5371,111 @@ msgstr ""
 "Vaise configurar a s�a conexi�n � internet/rede.\n"
 "Se non quere usar a detecci�n autom�tica, desmarque a caixa.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Escolla o perfil para configurar"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Usar detecci�n autom�tica"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Detectando os dispositivos..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Conexi�n normal por m�dem"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "detectado no porto %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "conexi�n por RDSI"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "detectouse %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "Conexi�n DSL (ou ADSL)"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "Conexi�n LAN"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "detectouse na interface %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Conexi�n por cable"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#, fuzzy
+msgid "cable connection detected"
+msgstr "Conexi�n por cable"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "Conexi�n LAN"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "tarxeta(s) ethernet detectada(s)"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "�Como quere conectar � Internet?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "Elixa a ferramenta que queira usar"
+
+#: ../../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 "Compartici�n da conexi�n � Internet"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "�Desexa que a conexi�n se inicie � arrincar?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Configuraci�n da rede"
+
+#: ../../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 "�Desexa reiniciar a rede?"
 
-#: ../../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 ""
 "Noraboa. A configuraci�n da rede e de internet est� rematada.\n"
 "\n"
-"Agora vai ser aplicada � seu sistema."
+"Agora vai ser aplicada � seu 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."
@@ -5663,31 +5483,7 @@ msgstr ""
 "Tras facer iso, acons�llase reiniciar o sistema X para\n"
 "evitar os problemas de mudar o nome de m�quina."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "non se atopou ningunha tarxeta de rede"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Configurando a rede"
-
-#: ../../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 ""
-"Introduza o nome da s�a m�quina se o co�ece.\n"
-"Alg�ns servidores DHCP precisan o nome da m�quina para funcionar.\n"
-"Este nome debe ser completamente cualificado,\n"
-"como ``mi�amaquina.meulab.mi�acomp.es''."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Nome de m�quina"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -5699,7 +5495,7 @@ msgstr ""
 "Simplemente acepte para manter o dispositivo configurado.\n"
 "Se modifica os campos de embaixo, subsituir� esta configuraci�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"
@@ -5709,38 +5505,38 @@ msgstr ""
 "Cada valor ten que ser introducido coma un enderezo IP en\n"
 "notaci�n decimal con puntos (por exemplo: 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 "Configurar o dispositivo de rede %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (controlador $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (controlador %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 "Enderezo IP"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "M�scara de rede"
 
-#: ../../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�tico"
 
-#: ../../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 "Os enderezos IP deben estar no formato 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"
@@ -5752,43 +5548,150 @@ msgstr ""
 "como ``mi�amaquina.meulab.mi�acomp.es''.\n"
 "Pode tam�n introducir o enderezo IP da pasarela se usa unha"
 
-#: ../../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 "Pasarela"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Dispositivo de pasarela"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Configuraci�n dos 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 "O proxy deber�a ser http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "O proxy deber�a ser ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Configuraci�n de Internet"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "�Quere probar agora a conexi�n � Internet?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Probando a conexi�n..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "O sistema est� conectado � Internet."
+
+#: ../../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 ""
+"Semella que o sistema non est� conectado � internet.\n"
+"Probe reconfigurando a conexi�n."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Configuraci�n da conexi�n"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Encha ou marque os campos de embaixo"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ da tarxeta"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Memoria da tarxeta (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "E/S da tarxeta"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "E/S_0 da tarxeta"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "E/S_1 da tarxeta"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "O seu n�mero de tel�fono persoal"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Nome do provedor (p.ex provider.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "N�mero de tel�fono do provedor"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Dns 1 do provedor (opcional)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Dns 2 do provedor (opcional)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Escoller teclado"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Modo de marcaci�n"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "Tipo de conexi�n: "
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Tipo de conexi�n: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Login da conta (nome de usuario)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Contrasinal da conta"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "As partici�ns estendidas non est�n soportadas nesta plataforma"
 
-#: ../../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 "
@@ -5798,26 +5701,21 @@ msgstr ""
 "A �nica soluci�n � desprazar as partici�ns primarias para que\n"
 "o burato est� despois das partici�ns estendidas"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Erro lendo o ficheiro %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Fallou a restauraci�n a partir do ficheiro %s: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Ficheiro de backup incorrecto"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Erro escribindo � ficheiro %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"
@@ -5847,49 +5745,213 @@ msgstr "bo"
 msgid "maybe"
 msgstr "indiferente"
 
-#: ../../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 "Impresora local"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Impresora remota"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Servidor CUPS remoto"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Servidor lpd remoto"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Impresora de rede (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 "Impresora SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "Impresora Netware"
+#: ../../printer.pm_.c:46
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "Servidor de impresi�n"
 
-#: ../../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 do dispositivo de impresi�n"
 
-#: ../../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�dulo %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Selecci�n da conexi�n da impresora"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "�Como est� conectada a impresora?"
+
+#: ../../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 ""
+"Cun servidor CUPS remoto, non ter� que configurar aqu�\n"
+"ningunha impresora, xa que ser�n detectadas automaticamente.\n"
+"No caso de d�bida, seleccione \"Servidor CUPS remoto\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Ning�n"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Escolla o usuario por defecto:"
+
+#: ../../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 "Rato"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Impresora remota"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "Os enderezos IP deben estar no formato 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "O n�mero de porto debe ser num�rico"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Impresora local"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "IP do servidor CUPS"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Porto"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Configuraci�n do estilo de arrinque"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Detectando os dispositivos..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Probar portos"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Unha impresora, de modelo \"%s\", foi detectada en "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Dispositivo de impresi�n 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"
@@ -5897,37 +5959,60 @@ msgstr ""
 "�A que dispositivo est� conectada a s�a impresora?\n"
 "(advirta que /dev/lp0 � equivalente a LPT1:)\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Dispositivo da impresora"
 
-#: ../../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 "Lendo a base de datos de controladores de CUPS..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Opci�ns da impresora remota 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 ""
 "Para utilizar unha fila de impresi�n remota lpd, � necesario\n"
 "que indique o nome do servidor de impresi�n e o nome da fila\n"
-"nese servidor, onde se deben colocar os traballos de impresi�n."
+"nese servidor."
+
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
+msgstr "Nome do servidor"
+
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Impresora remota"
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
 msgstr "Nome do servidor"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Fila de impresi�n remota"
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Nome do servidor"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opci�ns de impresora 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"
@@ -5942,29 +6027,37 @@ msgstr ""
 "da impresora que quere usar, as� como calquera nome de usuario,\n"
 "grupo de traballo ou contrasinal que for necesario."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "Servidor de SMB"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP do servidor SMB"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Nome de recurso compartido"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Grupo de traballo"
 
-#: ../../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 "Opci�ns de impresora 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."
@@ -5975,59 +6068,228 @@ msgstr ""
 "que desexa usar, as� como calquera nome de usuario ou contrasinal\n"
 "que for necesario."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Servidor de impresi�n"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Nome da fila de impresi�n"
 
-#: ../../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 "Opci�ns da impresora de 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 ""
 "Para imprimir nunha impresora de socket, ten que fornecer\n"
 "o nome do servidor da impresora, e opcionalmente o n�mero do porto."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Servidor de impresi�n"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Porto"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "Servidor de impresi�n"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "URI do dispositivo de impresi�n"
+
+#: ../../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:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Pode especificar directamente o URI para acceder � impresora co CUPS."
+#: ../../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 "Nome da impresora"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Descrici�n"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Localizaci�n"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Lendo a base de datos de controladores de CUPS..."
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "Conexi�n da impresora"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "�Qu� tipo de impresora ten?"
 
-#: ../../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�n de 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 "Configuraci�n de 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 "�Desexa probar a impresi�n?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Probar portos"
+
+#: ../../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 "Si, imprimir ambas p�xinas de proba"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Impresora"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Ferramentas est�ndar"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Imprimindo p�xina(s) de proba..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Imprimindo p�xina(s) de proba..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Imprimindo p�xina(s) de proba..."
 
-#: ../../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 ""
 "A(s) p�xina(s) de proba envi�ronse � servidor de impresi�n.\n"
 "Pode que lle leve un pouco ata que a impresora comece.\n"
@@ -6036,237 +6298,604 @@ msgstr ""
 "\n"
 "�Funciona correctamente?"
 
-#: ../../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 ""
 "A(s) p�xina(s) de proba envi�ronse � servidor de impresi�n.\n"
 "Pode que lle leve un pouco ata que a impresora comece.\n"
 "�Funciona correctamente?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Si, imprimir unha p�xina ASCII de proba"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Sen impresora"
+
+#: ../../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:235
-msgid "Yes, print PostScript test page"
-msgstr "Si, imprimir unha p�xina PostScript de proba"
+#: ../../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:236
-msgid "Yes, print both test pages"
-msgstr "Si, imprimir ambas p�xinas de proba"
+#: ../../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:243
-msgid "Configure Printer"
-msgstr "Configurar a impresora"
+#: ../../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:273
-msgid "Printer options"
+#: ../../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 "Desactivando a rede"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Opci�ns da impresora"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Tama�o do papel"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "Lendo a base de datos de controladores de CUPS..."
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "�Extraer a p�xina trala impresi�n?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Configuraci�n de Internet"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Opci�ns do controlador 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 "Opci�ns da profundidade de cor"
+#: ../../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 "�Imprimir texto como 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 "�Corrixir o efecto escaleira?"
+#: ../../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 "N�mero de p�xinas por p�xina de sa�da"
+#: ../../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 "Marxes dereita/esquerda en puntos (1/72 dunha polgada)"
+#: ../../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 "Marxes superior/inferior en puntos (1/72 dunha polgada)"
+#: ../../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 "Opci�ns extra do Ghostscript"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Opci�ns extra para texto"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Inverter a orde das p�xinas"
+#: ../../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 "�Desexa configurar unha impresora?"
+#: ../../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 ""
+
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Sen impresora"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
 msgstr ""
-"Estas son as filas de impresi�n.\n"
-"Pode engadir unha nova ou cambiar as que xa existen."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS iniciando"
+#: ../../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 "Lendo a base de datos de controladores de CUPS..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Selecci�n da conexi�n da impresora"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Configurar a impresora"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "�Como est� conectada a impresora?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Probando a conexi�n..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Seleccionar a conexi�n � impresora remota"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Configurar a rede"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "O monitor non est� configurado"
+
+#: ../../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 ""
-"Cun servidor CUPS remoto, non ter� que configurar aqu�\n"
-"ningunha impresora, xa que ser�n detectadas automaticamente.\n"
-"No caso de d�bida, seleccione \"Servidor CUPS remoto\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Configurando a rede"
+
+#: ../../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 ""
-"Cun servidor CUPS remoto, non ter� que configurar aqu�\n"
-"ningunha impresora, xa que ser�n detectadas automaticamente,\n"
-"a menos que te�a un servidor nunha rede diferente. Neste\n"
-"caso, ter� que indicar o enderezo IP do servidor de CUPS\n"
-"e opcionalmente o n�mero de porto."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "IP do 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 "O n�mero de porto debe ser num�rico"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "�Que sistema de impresi�n desexa usar?"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Eliminar fila"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Alto"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoico"
+
+#: ../../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 ""
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "�Que sistema de impresi�n desexa usar?"
+
+#: ../../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 impresora necesita un nome (por exemplo lp).\n"
-"P�dense definir outros par�metros como a descrici�n da\n"
-"impresora ou a s�a localizaci�n. �Que nome quere usar para\n"
-"esta impresora e como est� conectada?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Nome da impresora"
+#: ../../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 "Descrici�n"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Localizaci�n"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "Selecci�n da conexi�n da impresora"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "�Que sistema de impresi�n desexa usar?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Configurar impresora"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Opci�ns da impresora"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Lendo a base de datos de controladores de CUPS..."
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "�Desexa configurar unha impresora?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
+msgid ""
+"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 ""
+
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Por omisi�n)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Servidor CUPS remoto"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Servidor CUPS remoto"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Sen impresora"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "�Desexa probar a configuraci�n?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Configuraci�n de Internet"
 
-#: ../../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 ""
-"Cada fila de impresi�n (� que se dirixen os traballos de impresi�n)\n"
-"necesita un nome (frecuentemente lp) e un directorio spool asociado\n"
-"a el. �Qu� nome e directorio quere que se utilicen para esta fila e como\n"
-"est� conectada a impresora?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Nome da fila"
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Directorio spool"
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Compartici�n da conexi�n � Internet"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
 msgstr "Conexi�n da impresora"
 
-#: ../../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 "Imprimindo p�xina(s) de proba..."
+
+#: ../../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 "Impresora remota"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Lendo a base de datos de controladores de 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 "�Desexa reiniciar a rede?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Lendo a base de datos de controladores de CUPS..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "Configuraci�n dos 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 "Porto"
+
+#: ../../proxy.pm_.c:44
+#, fuzzy
+msgid "Url should begin with 'http:'"
+msgstr "O proxy deber�a ser http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+#, fuzzy
+msgid "The port part should be numeric"
+msgstr "O n�mero de porto debe ser num�rico"
+
+#: ../../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 "O proxy deber�a 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 "Login autom�tico"
+
+#: ../../proxy.pm_.c:82
+#, fuzzy
+msgid "password"
+msgstr "Contrasinal"
+
+#: ../../proxy.pm_.c:84
+#, fuzzy
+msgid "re-type password"
+msgstr "Sen contrasinal"
+
+#: ../../proxy.pm_.c:88
+#, fuzzy
+msgid "The passwords don't match. Try again!"
+msgstr "Os contrasinais non coinciden"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Non se pode engadir unha partici�n � RAID _formatado_ md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Non se pode escribir o ficheiro $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Non se pode escribir o ficheiro %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid fallou"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid fallou (�pode que non estean as raidtools?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Non hai partici�ns dabondo para o nivel 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 xestor de comandos peri�dicos."
 
-#: ../../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."
@@ -6274,7 +6903,7 @@ msgstr ""
 "apmd �sase para monitorizar o estado da bater�a e rexistralo a trav�s do\n"
 "syslog. Tam�n pode usarse para apagar a m�quina cando a bater�a est� baixa."
 
-#: ../../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."
@@ -6283,7 +6912,7 @@ msgstr ""
 "se executou at, e lanza comandos de lotes cando a carga media � baixa\n"
 "dabondo."
 
-#: ../../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 "
@@ -6295,7 +6924,7 @@ msgstr ""
 "caracter�sticas � cron b�sico de UNIX, incluindo mellor seguridade e\n"
 "opci�ns de configuraci�n m�is potentes."
 
-#: ../../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 "
@@ -6306,13 +6935,13 @@ msgstr ""
 "o Midnight Commander. Tam�n permite operaci�ns de cortar e pegar co rato\n"
 "na consola, as� como incl�e soporte para men�s."
 
-#: ../../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."
@@ -6320,7 +6949,7 @@ msgstr ""
 "Apache � un servidor de World Wide Web.  �sase para servir ficheiros HTML\n"
 "e 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 "
@@ -6334,13 +6963,13 @@ msgstr ""
 "moitos servicios, inclu�ndo telnet, ftp, rsh, e rlogin. Desactivando inetd\n"
 "desact�vanse t�dolos servicios de internet dos que � 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"
@@ -6351,23 +6980,23 @@ msgstr ""
 "Este pode escollerse usando a utilidade kbdconfig. Deber�a deixar isto\n"
 "activado para a maior�a dos sistemas."
 
-#: ../../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)."
@@ -6376,13 +7005,13 @@ msgstr ""
 "correctamente. � basicamente un servidor que distrib�e os traballos de\n"
 "impresi�n �(s) impresora(s)."
 
-#: ../../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."
@@ -6390,7 +7019,7 @@ msgstr ""
 "named (BIND) � un servidor de nomes de dominio (DNS), que se emprega\n"
 "para converter os nomes de m�quinas a enderezos 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."
@@ -6398,7 +7027,7 @@ msgstr ""
 "Monta e desmonta t�dolos puntos de montaxe de sistemas de\n"
 "ficheiros de Rede (NFS), SMB (Lan Manager/Windows) e NCP (NetWare)."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6406,7 +7035,7 @@ msgstr ""
 "Activa/desactiva t�dalas interfaces de rede configuradas para\n"
 "seren activadas no arrinque."
 
-#: ../../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"
@@ -6417,7 +7046,7 @@ msgstr ""
 "Este servicio fornece funcionalidade de servidor NFS, que se configura co\n"
 "ficheiro /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."
@@ -6425,17 +7054,17 @@ msgstr ""
 "NFS � un protocolo popular para compartir ficheiros a trav�s de\n"
 "redes TCP/IP. Este servicio fornece funcionalidade de bloqueo de ficheiros."
 
-#: ../../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 "
@@ -6446,7 +7075,7 @@ msgstr ""
 "port�tiles.  Non ser� arrincado ata que non estea configurado de xeito\n"
 "que non haxa problemas � telo instalado en m�quinas que non o precisan."
 
-#: ../../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 "
@@ -6457,7 +7086,7 @@ msgstr ""
 "como NFS e NIS. O servidor portmap ten que estar a se executar en m�quinas\n"
 "que act�an de servidores de protocolos que usan o mecanismo 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."
@@ -6465,7 +7094,7 @@ msgstr ""
 "Postfix � un axente de transporte de correo (MTA), que � o programa\n"
 "que move o correo dunha m�quina a outra."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6473,13 +7102,13 @@ msgstr ""
 "Garda e restaura o estado da entrop�a do sistema para unha xeraci�n\n"
 "de n�meros aleatorios de calidade."
 
-#: ../../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"
@@ -6490,7 +7119,7 @@ msgstr ""
 "en redes pequenas, outros protocolos m�is complexos de encami�amento\n"
 "prec�sanse para redes m�is complexas."
 
-#: ../../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."
@@ -6498,7 +7127,7 @@ msgstr ""
 "O protocolo rstat permite �s usuarios dunha rede obter\n"
 "m�tricas de rendemento de calquera m�quina desa rede."
 
-#: ../../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."
@@ -6506,7 +7135,7 @@ msgstr ""
 "O protocolo rusers permite �s usuarios dunha rede identificar quen\n"
 "est� conectado noutras m�quinas activas."
 
-#: ../../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)."
@@ -6515,12 +7144,12 @@ msgstr ""
 "t�dolos usuarios conectados a unha m�quina que est� a executar o daemon\n"
 "rwho (similar � finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 #, fuzzy
 msgid "Launch the sound system on your machine"
 msgstr "Lanzar o sistema X-Window � 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."
@@ -6529,32 +7158,71 @@ msgstr ""
 "nos diversos ficheiros de rexistro do sistema.  � unha boa idea executar\n"
 "sempre o 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 "Executa e para o Servidor de Fontes X � arrincar e apagar."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Escolla os servicios que deben ser lanzados no arrinque do sistema"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Impresora"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../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 "Opci�ns da impresora remota lpd"
+
+# ../../share/compssUsers
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Bases de datos"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "dispositivo"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "a se executar"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "parado"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Servicios e daemons"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -6562,11 +7230,16 @@ msgstr ""
 "Non hai informaci�n adicional\n"
 "sobre este servicio, desculpe."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "� arrincar"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Instalando o paquete %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"
@@ -6574,15 +7247,66 @@ msgstr ""
 "Non se pode ler a t�boa de partici�ns, est� demasiado deteriorada :-(\n"
 "Probarase a ir po�endo en branco as partici�ns err�neas"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Erro"
+
+#: ../../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 "Configuraci�n trala instalaci�n"
+
+#: ../../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�n do estilo de arrinque"
+
+#: ../../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 "�Noraboa!"
+
+#: ../../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 "Compartici�n da conexi�n � Internet"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "A compartici�n da conexi�n � Internet est� activada"
 
-#: ../../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"
@@ -6594,31 +7318,31 @@ msgstr ""
 "\n"
 "�Que desexa facer?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "desactivar"
 
-#: ../../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 "reconfigurar"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Desactivando os servidores..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "A compartici�n da conexi�n � Internet est� agora desactivada."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "A compartici�n da conexi�n � Internet est� desactivada"
 
-#: ../../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"
@@ -6630,27 +7354,19 @@ msgstr ""
 "\n"
 "�Que desexa facer?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "activar"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "Activando os servidores..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "A compartici�n da conexi�n � Internet est� agora activada."
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Non foi posible interpretar o contido do ficheiro de configuraci�n."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Ficheiro de configuraci�n non reco�ecido"
-
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:182
 #, fuzzy
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -6666,21 +7382,21 @@ msgstr ""
 "Nota: necesita un adaptador de rede dedicado para configurar unha rede de "
 "�rea local (LAN)."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interface %s (usando o m�dulo %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 "�Non hai ning�n adaptador de rede no seu 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."
@@ -6689,6 +7405,10 @@ msgstr ""
 "ferramenta de configuraci�n de hardware."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Interface de rede"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -6703,30 +7423,31 @@ msgstr ""
 "\n"
 "Vaise configurar a rede de �rea local usando ese adaptador."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
 "Escolla o adaptador de rede que vai estar conectado � rede de �rea local."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Atenci�n, o adaptador de rede xa est� configurado. Vai ser reconfigurado."
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, fuzzy, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "�Atopouse un conflicto potencial de enderezos da LAN na configuraci�n actual "
 "de %_!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "�Detectouse unha configuraci�n de 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."
@@ -6734,24 +7455,21 @@ msgstr ""
 "�Atenci�n! Detectouse unha configuraci�n de firewall existente. Pode que "
 "te�a que facer alg�n arranxo manual trala instalaci�n."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Configurando..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Configurando os scripts, instalando o software, iniciando os servidores..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Problemas instalando o paquete $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "�Noraboa!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Problemas instalando o paquete %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 "
@@ -6761,7 +7479,7 @@ msgstr ""
 "Agora pode compartir a conexi�n � Internet con outros ordenadores da rede de "
 "�rea local, usando a configuraci�n autom�tica de rede (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 #, fuzzy
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
@@ -6770,7 +7488,7 @@ msgstr ""
 "\n"
 "�Que desexa facer?"
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 #, fuzzy
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
@@ -6779,17 +7497,17 @@ msgstr ""
 "\n"
 "�Que desexa facer?"
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 #, fuzzy
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "A compartici�n da conexi�n � Internet est� activada"
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 #, fuzzy
 msgid "Internet connection sharing configuration"
 msgstr "Conexi�n e configuraci�n de Internet"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -6799,87 +7517,86 @@ msgid ""
 "Click on Configure to launch the setup wizard."
 msgstr ""
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Configuraci�n de rede (%d adaptadores)"
 
-#: ../../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 "Borrar perfil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Perfil para borrar:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Novo perfil..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Nome do perfil para 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 "Nome de m�quina: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Acceso � Internet"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Pasarela:"
 
-#: ../../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 "Estado:"
 
-#: ../../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 "Conectar..."
 
-#: ../../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 "Non conectado"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Conectar..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 #, fuzzy
 msgid "Disconnect..."
 msgstr "Conectar..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 #, fuzzy
 msgid "Starting your connection..."
 msgstr "Probando a conexi�n..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 #, fuzzy
 msgid "Closing your connection..."
 msgstr "Probando a conexi�n..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -6887,121 +7604,116 @@ msgid ""
 "in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 #, fuzzy
 msgid "The system is now disconnected."
 msgstr "O sistema est� conectado � Internet."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Configurar o acceso � Internet..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "Configuraci�n da LAN"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adaptador"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Controlador"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interface"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Estado:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Configurar a rede de �rea local..."
 
-#: ../../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 ""
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Por favor, agarde... Aplicando a configuraci�n"
 
-#: ../../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�n da 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 "Protocolo de arrinque"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Iniciado o arrincar"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "Cliente DHCP"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Desactivar"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Activar"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
 msgstr "Activar"
 
-#: ../../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�n da conexi�n � Internet"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Configuraci�n da conexi�n � Internet"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Tipo de conexi�n: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Par�metros"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Dns 1 do provedor (opcional)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Dns 2 do provedor (opcional)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Tarxeta Ethernet"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "Cliente DHCP"
 
@@ -7070,15 +7782,30 @@ msgstr ""
 "T�manse caracter�sticas do nivel 4, pero agora o sistema est� completamente\n"
 "pechado. As caracter�sticas de seguridade est�n � m�ximo nivel."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Establecendo o nivel de seguridade"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Escolla as opci�ns para o 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 "Establecendo o nivel de seguridade"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Centro de control"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Elixa a ferramenta que queira usar"
 
@@ -7107,89 +7834,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 "non se atopou ning�n serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "�Emular o terceiro bot�n?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Probe o seu rato"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-#, fuzzy
-msgid "Network Monitoring"
-msgstr "Configuraci�n da rede"
-
-#: ../../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 "Rato"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Connecting to Internet "
-msgstr "Conectar � Internet"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Disconnecting from Internet "
-msgstr "Desconectar de Internet"
-
-#: ../../standalone/net_monitor_.c:114
-#, fuzzy
-msgid "Disconnection from Internet failed."
-msgstr "Desconectar de Internet"
-
-#: ../../standalone/net_monitor_.c:115
-#, fuzzy
-msgid "Disconnection from Internet complete."
-msgstr "Desconectar de Internet"
-
-#: ../../standalone/net_monitor_.c:117
-#, fuzzy
-msgid "Connection complete."
-msgstr "Nome da conexi�n"
-
-#: ../../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
-msgid "Connect"
-msgstr "Conectar"
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Disconnect"
-msgstr "conexi�n por RDSI"
-
 #: ../../standalone/tinyfirewall_.c:29
 #, fuzzy
 msgid "Firewalling Configuration"
@@ -7215,16 +7867,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 "Escoller a lingua"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Clase de instalaci�n"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Detectar discos duros"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Configurar o rato"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Escoller teclado"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr ""
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Sistemas de ficheiros"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formatar partici�ns"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Seleccionar paquetes"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Instalar sistema"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Engadir usuario"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Configurar a rede"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Configurar servicios"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Crear disquete de arrinque"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Cargador de arrinque"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Configurar as X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Sa�r da instalaci�n"
+
+#: ../../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"
@@ -7235,7 +7955,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"
@@ -7243,7 +7963,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"
@@ -7251,7 +7971,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"
@@ -7260,7 +7980,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"
@@ -7268,7 +7988,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"
@@ -7276,7 +7996,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"
@@ -7284,7 +8004,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"
@@ -7292,7 +8012,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"
@@ -7300,7 +8020,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"
@@ -7309,7 +8029,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"
@@ -7317,120 +8037,107 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, fuzzy, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Adaptador %s: %s"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, fuzzy, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Erro � abrir %s para escritura: %s"
 
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Desenvolvemento"
-
-#: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Estaci�n de traballo"
-
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Encami�ador"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Xesti�n de informaci�n persoal"
+msgid "Network Computer (client)"
+msgstr "Ordenador de rede (cliente)"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Gr�ficos"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Office"
+msgstr "Office"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Ordenador de rede (cliente)"
+msgid "Gnome Workstation"
+msgstr "Estaci�n de traballo Gnome"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Ferramentas de audio: reproductores de mp3 ou midi, mesturadores, etc"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Ferramentas para o seu Palm Pilot ou o seu Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Estaci�n Internet"
+msgid "Workstation"
+msgstr "Estaci�n de traballo"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Firewall/Router"
+msgstr "Firewall/Encami�ador"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Estaci�n multimedia"
+msgid "Domain Name and Network Information Server"
+msgstr ""
 
 # ../../share/compssUsers
 #: ../../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 ""
-"Conxunto de ferramentas para ler e enviar correo e novas (pine, mutt, tin..) "
-"e para navegar na Web"
+"Programas de oficina: procesadores de texto (kword, abiword), follas de "
+"c�lculo (kspread, gnumeric), visualizadores de pdf, etc"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-"Bibliotecas de desenvolvemento en C e C++, programas e ficheiros include"
-
-#: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Ferramentas de audio: reproductores de mp3 ou midi, mesturadores, etc"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programas para xestionar as s�as finanzas, como o gnucash"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libros e howtos sobre Linux e o software libre"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "KDE Workstation"
+msgstr "Estaci�n de traballo KDE"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentaci�n"
+msgid "Multimedia - Video"
+msgstr "Multimedia - V�deo"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Conxunto de ferramentas para correo, novas, web, transferencia de ficheiros "
+"e chat"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Utilidades"
+msgid "Database"
+msgstr "Bases de datos"
 
 #: ../../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 "�Desexa probar a configuraci�n?"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia - Sound"
@@ -7438,63 +8145,74 @@ msgstr "Multimedia - Son"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de divertimentos: arcade, taboleiros, estratexia, etc"
+msgid "Utilities"
+msgstr "Utilidades"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Reproductores e editores de v�deo"
+msgid "Documentation"
+msgstr "Documentaci�n"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid "Console Tools"
 msgstr "Ferramentas de consola"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programas de reproducci�n/edici�n de son e v�deo"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Estaci�n de traballo cient�fica"
+msgid "Internet station"
+msgstr "Estaci�n Internet"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, shells, ferramentas de ficheiro, terminais"
+msgid "Multimedia station"
+msgstr "Estaci�n multimedia"
+
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuraci�n da LAN"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libros e howtos sobre Linux e o software libre"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "M�is escritorios gr�ficos (Gnome, IceWM)"
 
 # ../../share/compssUsers
 #: ../../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 ""
-"Un ambiente gr�fico cun conxunto de aplicaci�ns amigables e ferramentas de "
-"escritorio"
+"O ambiente de escritorio KDE, o ambiente gr�fico b�sico cunha colecci�n de "
+"ferramentas que o acompa�an"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
+msgid "Graphical Environment"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Xogos"
+msgid "Development"
+msgstr "Desenvolvemento"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - V�deo"
+msgid "Apache, Pro-ftpd"
+msgstr ""
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Servidor de ordenadores de rede"
+msgid "Tools to create and burn CD's"
+msgstr "Ferramentas para crear e gravar CDs"
+
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Estaci�n de traballo de oficina"
+
+# ../../share/compssUsers
+#: ../../share/compssUsers:999
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
@@ -7502,139 +8220,973 @@ msgid "Graphics programs such as The Gimp"
 msgstr "Programas gr�ficos como o Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Estaci�n de traballo de oficina"
+msgid "DNS/NIS "
+msgstr ""
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "C and C++ development libraries, programs and include files"
 msgstr ""
-"O ambiente de escritorio KDE, o ambiente gr�fico b�sico cunha colecci�n de "
-"ferramentas que o acompa�an"
+"Bibliotecas de desenvolvemento en C e C++, programas e ficheiros include"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "M�is escritorios gr�ficos (Gnome, IceWM)"
+msgid "Network Computer server"
+msgstr "Servidor de ordenadores de rede"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Ferramentas para crear e gravar CDs"
+msgid "Mail/Groupware/News"
+msgstr "Correo/Groupware/Novas"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Gravaci�n de CD"
+msgid "Game station"
+msgstr "Estaci�n de xogos"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Archiving, emulators, monitoring"
-msgstr "Arquivado, emuladores, monitorizaxe"
+msgid "Video players and editors"
+msgstr "Reproductores e editores de v�deo"
+
+#: ../../share/compssUsers:999
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Gr�ficos"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Bases de datos"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programas de divertimentos: arcade, taboleiros, estratexia, etc"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programas de oficina: procesadores de texto (kword, abiword), follas de "
-"c�lculo (kspread, gnumeric), visualizadores de pdf, etc"
+"Conxunto de ferramentas para ler e enviar correo e novas (pine, mutt, tin..) "
+"e para navegar na Web"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Servidor"
+msgid "Archiving, emulators, monitoring"
+msgstr "Arquivado, emuladores, monitorizaxe"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid "Personal Finance"
 msgstr "Finanzas persoais"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuraci�n"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Un ambiente gr�fico cun conxunto de aplicaci�ns amigables e ferramentas de "
+"escritorio"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Estaci�n de traballo KDE"
+msgid "Clients for different protocols including ssh"
+msgstr ""
+
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Internet gateway"
+msgstr "Acceso � Internet"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Outros escritorios gr�ficos"
+msgid "Sound and video playing/editing programs"
+msgstr "Programas de reproducci�n/edici�n de son e v�deo"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
+msgid "Other Graphical Desktops"
+msgstr "Outros escritorios gr�ficos"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Correo/Groupware/Novas"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editores, shells, ferramentas de ficheiro, terminais"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Estaci�n de traballo Gnome"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programas para xestionar as s�as finanzas, como o gnucash"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Acceso � Internet"
+msgid "Games"
+msgstr "Xogos"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Ferramentas para o seu Palm Pilot ou o seu Visor"
+msgid "Personal Information Management"
+msgstr "Xesti�n de informaci�n persoal"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Estaci�n de xogos"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Gravaci�n de CD"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Scientific Workstation"
+msgstr "Estaci�n de traballo cient�fica"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "non se pode abrir /etc/sysconfig/autologin para lectura: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "�Desexa reiniciar a rede?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "�Concorda?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Est� a piques de se reiniciar o dispositivo de rede:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Est� a piques de se reiniciar o dispositivo de rede %s. �Concorda?"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "�Desexa probar a configuraci�n?"
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "A menos que vostede saiba que � outra especificamente, a escolla habitual "
+#~ "�\n"
+#~ "\"/dev/hda\" (a unidade mestra da canle primaria) ou \"/dev/sda"
+#~ "\" (primeiro\n"
+#~ "disco SCSI)."
 
-# ../../share/compssUsers
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Conxunto de ferramentas para correo, novas, web, transferencia de ficheiros "
-"e chat"
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Estas son as filas de impresi�n.\n"
+#~ "Pode engadir unha nova ou cambiar as que xa existen."
+
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Tipo de conexi�n: "
+
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Escolla o usuario por defecto:"
+
+#, fuzzy
+#~ msgid "Test the mouse here."
+#~ msgstr "Probe o seu rato"
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr "Escolla a lingua que prefira para a instalaci�n e para o 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 ""
+#~ "Ten que aceptar os termos da licencia de enriba para continuar coa "
+#~ "instalaci�n.\n"
+#~ "\n"
+#~ "\n"
+#~ "Por favor, prema \"Aceptar\" se concorda con eses termos.\n"
+#~ "\n"
+#~ "\n"
+#~ "Por favor, prema \"Rexeitar\" se non concorda con eses termos. A "
+#~ "instalaci�n rematar� sen modificar a s�a configuraci�n actual."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Escolla a disposici�n do teclado que corresponda � seu na lista"
+
+#~ 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 ""
+#~ "Se desexa ter outras linguas (� parte da que escolleu � principio da\n"
+#~ "instalaci�n) dispo�ibles trala instalaci�n, esc�llaas na lista de "
+#~ "enriba.\n"
+#~ "Se quere seleccionar todas, s� ten que usar \"Todas\"."
+
+#~ 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 ""
+#~ "Seleccione:\n"
+#~ "\n"
+#~ "  - Personalizada: Se xa est� familiarizado con GNU/Linux, pode ent�n "
+#~ "escoller\n"
+#~ "    o uso principal da s�a m�quina. Mire embaixo para os detalles.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Experto: Isto sup�n que vostede manexa ben GNU/Linux e quere facer\n"
+#~ "    unha instalaci�n altamente personalizada. Do mesmo xeito que coa\n"
+#~ "    clase de instalaci�n \"Personalizada\", poder� escoller o uso do seu\n"
+#~ "    sistema. Pero, por favor, �NON ESCOLLA ISTO A MENOS QUE SAIBA O QUE\n"
+#~ "    EST� A FACER!"
+
+#~ 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 ""
+#~ "Agora ten que definir o uso da s�a m�quina. As escollas son:\n"
+#~ "\n"
+#~ "* Estaci�n de traballo: esta � a escolla ideal se pretende usar a s�a "
+#~ "m�quina principalmente para o uso coti�n,\n"
+#~ "  na oficina ou na casa.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Desenvolvemento: se pretende usar a s�a m�quina principalmente para o "
+#~ "desenvolvemento de software, esta � unha boa escolla.\n"
+#~ "  Ter� unha completa colecci�n de software instalado para compilar, "
+#~ "depurar e formatar c�digo fonte, ou\n"
+#~ "  para crear paquetes de software.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Servidor: se pretende usar esta m�quina coma servidor, � a escolla "
+#~ "correcta. Sexa un servidor de ficheiros (NFS\n"
+#~ "  ou SMB), un servidor de impresi�n (estilo Unix ou Microsoft Windows), "
+#~ "un servidor de autenticaci�n (NIS), un servidor\n"
+#~ "  de bases de datos, etc... Como tal, non espere que haxa cousas como "
+#~ "KDE, GNOME, etc. instaladas."
+
+#, 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 ""
+#~ "Agora pode selecciona-lo grupo de paquetes que desexa instalar\n"
+#~ "ou actualizar.\n"
+#~ "\n"
+#~ "DrakX comprobar� se ten espacio dabondo para instalalos todos. Se non,\n"
+#~ "avisaralle diso. Se quere seguir a�nda as�, proceder� coa instalaci�n\n"
+#~ "de t�dolos grupos seleccionados, pero deixar� alg�n de menor interese.\n"
+#~ "� final da lista pode marca-la opci�n \"Selecci�n individual de paquetes"
+#~ "\";\n"
+#~ "neste caso ter� que percorrer m�is de 1000 paquetes..."
+
+#~ 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 ""
+#~ "Se ten t�dolos CDs da lista superior, prema Aceptar. Se non ten\n"
+#~ "ning�n deses CDs, prema Cancelar. Se s� faltan alg�ns dos CDs,\n"
+#~ "desm�rqueos, e prema Aceptar."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Acenda o seu m�dem e escolla o correcto."
+
+#, 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 ""
+#~ "Vostede pode agora introduci-las opci�ns de chamada. Se non est� seguro "
+#~ "de\n"
+#~ "que escribir, a informaci�n correcta pode obtela do seu 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 ""
+#~ "Introduza:\n"
+#~ "\n"
+#~ "  - Direcci�n IP: se non a co�ece, preg�ntelle � seu administrador de "
+#~ "rede\n"
+#~ "ou ISP.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - M�scara de Rede: \"255.255.255.0\" � normalmente unha boa elecci�n. "
+#~ "Se\n"
+#~ "non est� seguro, pregunte � seu administrador de rede ou ISP.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - IP autom�tica: Se a s�a rede usa o protocolo bootp ou dhcp, escolla\n"
+#~ "esta opci�n. Neste caso, non � necesario ning�n valor en \"Direcci�n IP"
+#~ "\".\n"
+#~ "Se non est� seguro, pregunte � seu administrador de rede ou 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 ""
+#~ "Se a s�a rede usa NIS, escolla \"Usar NIS\". Se non o sabe, preg�ntelle "
+#~ "�\n"
+#~ "seu administrador de rede."
+
+#~ 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 ""
+#~ "Agora pode introducir as opci�ns de marcado. Se non est� seguro do\n"
+#~ "que escribir, a informaci�n correcta pode obtela do seu 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 ""
+#~ "Se vai usar proxys, config�reos agora. Se non sabe se vai usar proxys,\n"
+#~ "pregunte � seu administrador de rede ou � seu ISP."
+
+#, 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 ""
+#~ "Pode instalar paquetes de criptograf�a se xa configurou a s�a conexi�n a\n"
+#~ "internet correctamente. Primeiro escolla un espello do que quere baixa-"
+#~ "los\n"
+#~ "paquetes, e ent�n escolla os paquetes que desexa instalar.\n"
+#~ "\n"
+#~ "Perc�tese de que ten que escolle-lo espello e os paquetes criptogr�ficos\n"
+#~ "de acordo coa s�a lexislaci�n."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr ""
+#~ "Agora pode seleccionar a zona horaria dependendo do lugar onde viva."
+
+#, fuzzy
+#~ 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 ""
+#~ "Agora pode introduci-lo contrasinal do superusuario para o seu sistema\n"
+#~ "Mandrake Linux. O contrasinal deber� ser tecleado d�as veces para\n"
+#~ "comprobar que �mbolos dous son id�nticos.\n"
+#~ "\n"
+#~ "\n"
+#~ "O superusuario (root) � o administrador do sistema, e � o �nico usuario\n"
+#~ "� que se lle permete modifica-la configuraci�n do sistema. �Por tanto,\n"
+#~ "escolla o contrasinal con coidado! O uso non autorizado da conta de root\n"
+#~ "pode ser extremadamente perigoso para a integridade do sistema e os seus\n"
+#~ "datos, e para os outros sistemas conectados a el. O contrasinal deber�a\n"
+#~ "ser unha mestura de caracteres alfanum�ricos e de 8 caracteres de longo,\n"
+#~ "polo menos. NUNCA debe ser anotado. Non escolla un contrasinal longo\n"
+#~ "de m�is ou complicado: ten que ser capaz de lembralo sen moito esforzo."
+
+# Non � realmente fuzzy, � s� para revisala. :)
+#, fuzzy
+#~ 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 ""
+#~ "Pode agora crear unha ou varias contas de usuarios �normais�, como\n"
+#~ "contraposici�n � conta de usuario �privilexiado�, root. Vostede\n"
+#~ "pode crear unha ou m�is contas para cada persoa � que vostede queira\n"
+#~ "permitirlle o uso do ordenador. Note que cada conta de usuario ter�\n"
+#~ "as s�as preferencias (ambiente gr�fico, configuraci�n dos programas, "
+#~ "etc.)\n"
+#~ "e o seu propio directorio (chamado \"home\"), no que se almacenan esas\n"
+#~ "preferencias.\n"
+#~ "\n"
+#~ "\n"
+#~ "Antes que nada, �cree unha conta para vostede mesmo! A�nda se � a �nica\n"
+#~ "persoa que vai usa-la m�quina, NON debe entrar como root para o uso\n"
+#~ "diario do sistema: � un risco de seguridade elevado. Facer que o\n"
+#~ "sistema fique totalmente inoperante, pode ser moitas veces causa dun\n"
+#~ "simple erro � teclear.\n"
+#~ "\n"
+#~ "\n"
+#~ "Polo tanto, debe entrar no sistema usando a conta de usuario normal que\n"
+#~ "vai crear aqu�, e entrar como root s� para as tarefas de administraci�n\n"
+#~ "que o precisen."
+
+#, 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 ""
+#~ "As opci�ns principais do LILO e do grub son:\n"
+#~ "  - Dispositivo de arrinque: Establece o nome do dispositivo (p.ex unha\n"
+#~ "partici�n dun disco duro) que cont�n o sector de arrinque. A menos que\n"
+#~ "saiba espec�ficamente que � outro, escolla \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Retardo antes de arrinca-la imaxe por omisi�n: Indica o n�mero de\n"
+#~ "d�cimas de segundo que agardar� o cargador de inicio antes de arrincar a\n"
+#~ "primeira imaxe. Isto � �til nos sistemas que arrincan inmediatamente do\n"
+#~ "disco duro tras activa-lo teclado. O boot loader non agarda se o \"retardo"
+#~ "\"\n"
+#~ "� cero ou non se indica.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Modo de v�deo: Indica o modo de texto VGA que ser� utilizado �\n"
+#~ "arrincar. Os seguintes valores est�n dispo�ibles:\n"
+#~ "    * normal: escoller modo de texto normal 80x25.\n"
+#~ "    * <n�mero>: usa-lo modo de texto correspondente."
+
+#, 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"
+#~ "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 ""
+#~ "LILO (O LInux LOader) e Grub son cargadores de arrinque: poden arrincar\n"
+#~ "Linux ou outro sistema operativo presente no seu ordenador.\n"
+#~ "Normalmente, estes outros sitemas son detectados correctamente e "
+#~ "instalados.\n"
+#~ "Se non � o caso, pode engadir unha entrada a man nesta pantalla. Sexa\n"
+#~ "coidadoso na escolla dos par�metros correctos.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tam�n pode non querer dar acceso a eses outros sitemas operativos a "
+#~ "calquera,\n"
+#~ "poidendo borrar as entradas correspondentes. Pero neste caso, precisar�\n"
+#~ "un disquete de arrinque para poder usalos."
+
+#, 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."
+#~ msgstr ""
+#~ "As opci�ns principais do LILO e do grub son:\n"
+#~ "  - Dispositivo de arrinque: Establece o nome do dispositivo (p.ex unha\n"
+#~ "partici�n dun disco duro) que cont�n o sector de arrinque. A menos que\n"
+#~ "saiba espec�ficamente que � outro, escolla \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Retardo antes de arrinca-la imaxe por omisi�n: Indica o n�mero de\n"
+#~ "d�cimas de segundo que agardar� o cargador de inicio antes de arrincar a\n"
+#~ "primeira imaxe. Isto � �til nos sistemas que arrincan inmediatamente do\n"
+#~ "disco duro tras activa-lo teclado. O boot loader non agarda se o \"retardo"
+#~ "\"\n"
+#~ "� cero ou non se indica.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Modo de v�deo: Indica o modo de texto VGA que ser� utilizado �\n"
+#~ "arrincar. Os seguintes valores est�n dispo�ibles:\n"
+#~ "    * normal: escoller modo de texto normal 80x25.\n"
+#~ "    * <n�mero>: usa-lo modo de texto correspondente."
+
+#, 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"
+#~ "\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 ""
+#~ "Agora � o momento de configura-lo sistema de fiestras X, que �\n"
+#~ "o centro da interface gr�fica de Linux. Para iso necesita configura-\n"
+#~ "-la s�a tarxeta de v�deo e o seu monitor. A maior�a deses pasos est�n\n"
+#~ "automatizados, as� que probablemente a s�a tarea limitarase a verificar\n"
+#~ "o que se fixo e aceptar a configuraci�n proposta :-)\n"
+#~ "\n"
+#~ "\n"
+#~ "Cando a configuraci�n estea rematada, lanzarase o servidor X\n"
+#~ "(a menos que vostede lle pida a DrakX que non), de xeito que\n"
+#~ "poida comprobar se todo est� ben e corresponde � que desexa.\n"
+#~ "Se non, pode voltar atr�s e troca-la configuraci�n; tantas\n"
+#~ "veces como sexa necesario."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Se algo vai mal coa configuraci�n de X, use estas opci�ns para "
+#~ "configurar\n"
+#~ "correctamente o sistema X Window."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Se prefire usar un login gr�fico, escolla \"Si\". Doutro xeito,\n"
+#~ "seleccione \"Non\"."
+
+#~ 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 ""
+#~ "O sistema vaise reiniciar.\n"
+#~ "\n"
+#~ "Despois de reiniciar, o seu novo sistema Mandrake Linux cargarase\n"
+#~ "automaticamente. Se vostede quere iniciar outro sistema operativo que xa\n"
+#~ "exista, lea as instrucci�ns adicionais."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "Checo (Programadores)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Eslovaco (Programadores)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Nome do perfil para crear:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Escribir /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Restaurar a partir dun ficheiro"
+
+#~ msgid "Save in file"
+#~ msgstr "Gardar nun ficheiro"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Restaurar a partir dun disquete"
+
+#~ msgid "Format all"
+#~ msgstr "Formatar todas"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Logo de formatar t�dalas partici�ns,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "perderanse os datos nesas partici�ns"
+
+#~ msgid "Reload"
+#~ msgstr "Recargar"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "�Quere realmente xerar un disquete de instalaci�n para replicar linux?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "Configuraci�n de 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 ""
+#~ "Cun servidor CUPS remoto, non ter� que configurar aqu�\n"
+#~ "ningunha impresora, xa que ser�n detectadas automaticamente,\n"
+#~ "a menos que te�a un servidor nunha rede diferente. Neste\n"
+#~ "caso, ter� que indicar o enderezo IP do servidor de CUPS\n"
+#~ "e opcionalmente o n�mero de porto."
+
+#~ msgid "Remote queue"
+#~ msgstr "Fila de impresi�n remota"
+
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Fila de impresi�n remota"
+
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "Nome de dominio"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Sen impresora"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "restrinxir"
+
+#, fuzzy
+#~ msgid "Network Monitoring"
+#~ msgstr "Configuraci�n da rede"
+
+#~ msgid "Profile "
+#~ msgstr "Perfil "
+
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "Tipo de conexi�n: "
+
+#, fuzzy
+#~ msgid "Connecting to Internet "
+#~ msgstr "Conectar � Internet"
+
+#, fuzzy
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Desconectar de Internet"
+
+#, fuzzy
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Desconectar de Internet"
+
+#, fuzzy
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Desconectar de Internet"
+
+#, fuzzy
+#~ msgid "Connection complete."
+#~ msgstr "Nome da conexi�n"
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "Configuraci�n"
+
+#~ msgid "Connect"
+#~ msgstr "Conectar"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "conexi�n por RDSI"
+
+#~ msgid "/File/_New"
+#~ msgstr "/Ficheiro/_Novo"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Ficheiro/_Abrir"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>A"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Ficheiro/_Gardar"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>G"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Ficheiro/Gardar _como"
+
+#~ msgid "/File/-"
+#~ msgstr "Ficheiro/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Opci�ns"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Opci�ns/Proba"
+
+#~ msgid "/_Help"
+#~ msgstr "/A_xuda"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Axuda/_Acerca..."
+
+#, fuzzy
+#~ msgid "Default Runlevel"
+#~ msgstr "Por omisi�n"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "NetWare"
+#~ msgstr "Impresora Netware"
+
+#~ msgid "Remove queue"
+#~ msgstr "Eliminar fila"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Non foi posible interpretar o contido do ficheiro de configuraci�n."
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Ficheiro de configuraci�n non reco�ecido"
+
+#~ msgid "Adapter"
+#~ msgstr "Adaptador"
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid "Disable network"
+#~ msgstr "Desactivar a rede"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "Desactivar a rede"
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "Conexi�n DSL (ou ADSL)"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Rato"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr ""
+#~ "Pode especificar directamente o URI para acceder � impresora co CUPS."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Si, imprimir unha p�xina ASCII de proba"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Si, imprimir unha p�xina PostScript de proba"
+
+#~ msgid "Paper Size"
+#~ msgstr "Tama�o do papel"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "�Extraer a p�xina trala impresi�n?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Opci�ns do controlador Uniprint"
+
+#~ msgid "Color depth options"
+#~ msgstr "Opci�ns da profundidade de cor"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "�Imprimir texto como PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "�Corrixir o efecto escaleira?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "N�mero de p�xinas por p�xina de sa�da"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Marxes dereita/esquerda en puntos (1/72 dunha polgada)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Marxes superior/inferior en puntos (1/72 dunha polgada)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Opci�ns extra do Ghostscript"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Opci�ns extra para texto"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Inverter a orde das p�xinas"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS iniciando"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Seleccionar a conexi�n � impresora remota"
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ 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 impresora necesita un nome (por exemplo lp).\n"
+#~ "P�dense definir outros par�metros como a descrici�n da\n"
+#~ "impresora ou a s�a localizaci�n. �Que nome quere usar para\n"
+#~ "esta impresora e como est� conectada?"
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ 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 fila de impresi�n (� que se dirixen os traballos de impresi�n)\n"
+#~ "necesita un nome (frecuentemente lp) e un directorio spool asociado\n"
+#~ "a el. �Qu� nome e directorio quere que se utilicen para esta fila e como\n"
+#~ "est� conectada a impresora?"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minutos"
+#~ msgid "Name of queue"
+#~ msgstr "Nome da fila"
 
-#~ msgid "1 minute"
-#~ msgstr "1 minuto"
+#~ msgid "Spool directory"
+#~ msgstr "Directorio spool"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d segundos"
+#~ msgid "Disable"
+#~ msgstr "Desactivar"
+
+#~ msgid "Enable"
+#~ msgstr "Activar"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Para ter un sistema m�is seguro, deber�a seleccionar \"Usar ficheiro "
+#~ "shadow\"\n"
+#~ "e \"Usar contrasinais MD5\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Se a s�a rede usa NIS, escolla \"Usar NIS\". Se non o sabe, preg�ntelle "
+#~ "�\n"
+#~ "seu administrador de rede."
+
+#~ msgid "yellow pages"
+#~ msgstr "p�xinas amarelas (yp)"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "Configuraci�n da LAN"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "Dns 1 do provedor"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "Dns 2 do provedor"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "�Como quere conectar � Internet?"
 
 #~ msgid "Boot style configuration"
 #~ msgstr "Configuraci�n do estilo de arrinque"
@@ -7776,9 +9328,6 @@ msgstr ""
 #~ msgid "Internet/Network access"
 #~ msgstr "Acceso a Internet/Rede"
 
-#~ msgid "Mail information"
-#~ msgstr "Informaci�n do correo"
-
 #~ msgid ""
 #~ "Now that your Internet connection is configured,\n"
 #~ "your computer can be configured to share its Internet connection.\n"
@@ -7817,9 +9366,6 @@ msgstr ""
 #~ msgid "Scientific applications"
 #~ msgstr "Aplicaci�ns cient�ficas"
 
-#~ msgid "Standard tools"
-#~ msgstr "Ferramentas est�ndar"
-
 # ../../share/compssUsers
 #~ msgid "File/Print/Samba"
 #~ msgstr "Ficheiro/Impresi�n/Samba"
@@ -7828,9 +9374,6 @@ msgstr ""
 #~ msgid "DNS/DHCP "
 #~ msgstr "DNS/DHCP "
 
-#~ msgid "None"
-#~ msgstr "Ning�n"
-
 #~ msgid "Which bootloader(s) do you want to use?"
 #~ msgstr "�Que cargador(es) de arrinque quere usar?"
 
@@ -7840,9 +9383,6 @@ msgstr ""
 #~ msgid "Configure timezone"
 #~ msgstr "Zona horaria"
 
-#~ msgid "Configure printer"
-#~ msgstr "Configurar impresora"
-
 #~ msgid "Auto install floppy"
 #~ msgstr "Disquete de auto-instalaci�n"
 
@@ -7925,9 +9465,6 @@ msgstr ""
 #~ msgid "Disable Internet Connection"
 #~ msgstr "Desactivar a Conexi�n a Internet"
 
-#~ msgid "Disable networking"
-#~ msgstr "Desactivar a rede"
-
 #~ msgid "Configure the Internet connection / Configure local Network"
 #~ msgstr "Configurar a conexi�n a Internet / Configurar a Rede local"
 
@@ -7998,9 +9535,6 @@ msgstr ""
 #~ msgid "Update location"
 #~ msgstr "Actualizar lugar"
 
-#~ msgid "Remove"
-#~ msgstr "Quitar"
-
 #~ msgid "Configuration: Add Location"
 #~ msgstr "Configuraci�n: Engadir Lugar"
 
@@ -8016,9 +9550,6 @@ msgstr ""
 #~ msgid "Files:\n"
 #~ msgstr "Ficheiros:\n"
 
-#~ msgid "Uninstall"
-#~ msgstr "Desinstalar"
-
 #~ msgid "Choose package to install"
 #~ msgstr "Elixa o paquete a instalar"
 
diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po
index 2e0baed47..6f3204898 100644
--- a/perl-install/share/po/hr.po
+++ b/perl-install/share/po/hr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: Sun Jan 21 2001 12:52:56+0200\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-09-15  12:52:56+0200\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "MIME-Version: 1.0\n"
@@ -14,24 +14,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
 msgstr "Podesi sve zaslone nezavisno"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Koristi Xinerama pro�irenje"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Podesi samo karticu \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Vi�e-zaslonska postava"
 
-#: ../../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 ""
 "Va� sustav podr�ava postavu sa vi�e zaslona.\n"
 "�to �elite napraviti?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Grafi�ka kartica"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Odaberite grafi�ku karticu"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Odaberite X poslu�itelj"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X poslu�itelj"
 
-#: ../../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 "Koju konfiguraciju XFree-a �elite imati?"
 
-#: ../../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 ""
 "Va�a video kartica mo�e imati 3D ubrzanje samo sa XFree %s.\n"
 "Va�a kartica je podr�ana od XFree %s koji mo�da ima bolju podr�ku u 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 "Va�a kartica mo�e imati 3D hardware-sku akceleraciju sa 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 sa 3D hardware akceleracijom"
 
-#: ../../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 ""
 "UPOZORAVAMO VAS DA JE OVO EKSPERIMENTALNA PODR�KA I MO�E ZAMRZNUTI VA�E "
 "RA�UNALO."
 
-#: ../../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 sa EXPERIMENTALNOM 3D hardware akceleracijom"
 
-#: ../../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 ""
 "RA�UNALO.Va�a kartica je podr�ana od XFree %s koja mo�e imati bolju podr�ku "
 "u 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFree postavke"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Odaberite koli�inu memorije na grafi�koj kartici"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Postavke poslu�itelja"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Odaberite 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"
@@ -155,39 +160,39 @@ msgstr ""
 "ve�i od mogu�nosti va�eg monitora jer mo�ete o�tetiti va� monitor.\n"
 " Ukoliko ste u nedoumici, izaberite konzervativne postavke."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Horizontalna vrijednost osvje�avanja"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Vertikalna vrijednost osvje�avanja"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Niste podesili monitor"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Niste podesili grafi�ku karticu"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Niste podesili rezoluciju"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Da li �elite isku�ati postavu ?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Upozorenje: testiranje grafi�ke kartice mo�e zamrzunti va�e ra�unalo"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Isku�aj postavu"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -195,152 +200,156 @@ msgstr ""
 "\n"
 "provjerite parametre koje ste unjeli"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Pojavila se gre�ka:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Zatvaram nakon %d sekundi"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Da li je ovo ispravno?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Pojavila se gre�ka, provjerite parametre koje ste unjeli"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Rezolucija"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Odaberite rezoluciju  i color depth"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafi�ka kartica: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 poslu�itelj: %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 "Ekspertni mod"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Poka�i sve"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Rezolucije"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Raspored tipkovnice: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Vrsta mi�a: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Ure�aj mi�a: %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 "Horizontalna Sinkronizacija Monitora: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Vertikalno Osvje�enje Monitora: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafi�ka kartica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Grafi�ka kartica: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafi�ka memorija: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Dubina boje: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rezolucija: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 poslu�itelj: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 upravlja�ki program: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Pripremam X-Window postavu"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "�to �elite napraviti?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Promijeni monitor"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Promijeni grafi�ku karticu"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Promijeni postavke poslu�itelja"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Promijeni rezoluciju"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Prika�i informacije"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Isku�aj ponovo"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Zavr�i"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -353,20 +362,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Molim ponovo se logirajte u %s kako bi aktivirali promjenjeno"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Molim prvo se odjavite te pritisnite Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X kod pokretanja sustava"
 
-#: ../../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,216 +428,224 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB ili vi�e"
+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 ili vi�e"
+
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standardni VGA, 640x480 na 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 na 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 kompatibilan, 1024x768 na 87 Hz s preplitanjem (bez 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 na 87 Hz s preplitanjem, 800x600 na 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 "Pro�ireni Super VGA, 800x600 na 60 Hz, 640x480 na 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 "Bez preplitanja SVGA, 1024x768 na 60 Hz, 800x600 na 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Visoko frekvencijski SVGA, 1024x768 na 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frekvencijski koji ide do 1280x1024 na 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frekvencijski koji ide do 1280x1024 na 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frekvencijski koji ide do 1280x1024 na 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor koji ide do 1600x1200 na 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor koji ide do 1600x1200 na 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 "Prvi sektor boot particije"
 
-#: ../../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 "Prvi sektor pogona (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILO instalacija"
 
-#: ../../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 "Gdje �elite instalirati bootloader?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "LILO/grub instalacija"
 
-#: ../../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 sa tekstualnim menijem"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO sa grafi�kim menijem"
 
-#: ../../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 "Podizanje sa DOS/Windows-a (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 "Glavne postavke bootloadera"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Koristiti Bootloader"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Bootloader instalacija"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Boot ure�aj"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ne radi na starim BIOSima)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Zbijeno"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "zbijeno"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Video mod"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Odgoda prije bootiranja uobi�ajenog imagea"
 
-#: ../../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 "Lozinka"
 
-#: ../../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 "Lozinka (provjera)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Ograni�ene opcije na komandnoj liniji"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "ograni�i"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "O�isti /tmp na svakom podizanju"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Precizna veli�ina RAMa (prona�eno %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Omogu�i vi�e obrazaca"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Upi�ite veli�inu RAM u Mb"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Postavka ``Ograni�ene opcije na komandnoj liniji'' nema svrhe ako ne unesete "
 "lozinku"
 
-#: ../../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 "Molim poku�ajte ponovo"
 
-#: ../../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 "Lozinke se ne podudaraju"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Init poruka"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Pauza Otvorenog Firmware-a"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Vrijeme �ekanja podizanja kernela"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Omogu�i CD podizanje?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Omogu�i podizanje?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Uobi�ajeni 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."
@@ -636,145 +653,144 @@ msgstr ""
 "Ovo su trenutni zapisi.\n"
 "Mo�ete dodati jo� koji ili urediti postoje�i."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../../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 "Gotov"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 msgid "Modify"
 msgstr "Promjeni"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Kakvu vrstu zapisa �elite dodati"
 
-#: ../../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 "Drugi OS (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Drugi OS (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Drugi OS (Windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Slika (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 "Dodaj na kraj"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "�itaj-pi�i"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tablica"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Nesigurno"
 
-#: ../../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 "Oznaka"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Uobi�ajeno"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Initrd-veli�ina"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "NemaVidea"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Ukloni zapis"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Prazna oznaka nije dozvoljena"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Ova oznaka ve� postoji"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Kakav tip particioniranja?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Prona�ao sam %s %s me�usklopova"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Da li imate jo� koji?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Da li imate %s me�usklopova?"
 
-#: ../../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 "Da"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Poka�i info o hardveru"
 
 #. -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 "Instaliram upravlja�ki program %s za karticu %s"
 
-#: ../../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 "Koji %s upravlja�ki program �elite isprobati?"
 
-#: ../../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 +809,20 @@ msgstr ""
 "ra�unalo za informacije koje treba? Ponekad, isprobavanje mo�e zamrznuti\n"
 "va�e ra�unlo, ali ne bi trebalo izazvati nikakvu �tetu."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Auto. ispitaj"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Odredi postavke"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Sada mo�ete unijeti postavke za modul %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -817,11 +833,11 @@ msgstr ""
 "Postavke su formata ``ime=vrijednost ime2=vrijednost2...''.\n"
 "Na primjer, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Postavke modula:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -830,33 +846,33 @@ msgstr ""
 "U�itavanje modula %s nije uspjelo.\n"
 "Da li �elite poku�ati ponovo sa drugim parametrima?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(ve� postoji %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Lozinka je prejednostavna"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Molim dajte korisniku korisni�ko ime"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Korisni�ko ime mo�e sadr�avati samo mala slova, brojeve, `-' i `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Ovaj korisnik ve� postoji"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Dodaj korisnika"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -865,55 +881,68 @@ msgstr ""
 "Unesite korisnika\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Prihvati korisnika"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Puno ime"
 
-#: ../../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 "Korisni�ko ime"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Ljuska"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Auto-prijava"
 
-#: ../../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 ""
 "Ra�unalo se mo�e podesiti da se automatski prijavi kod podizanja sustava "
 "npr. ne�e biti potrebno unositi nikakvu korisni�ko ime ili lozinku.\n"
 "Pritisnite Odustani ako ne �elite aktivirati automatsku prijavu ?"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Izaberite uobi�ajenog korisnika:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Izaberite prozorski upravitelj koji �elite pokrenuti:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Molim izaberite jezik koji �elite koristiti."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "Mo�ete izabrati druge jezike koji �e biti dostupni nakon instalacije"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Sve"
+
 # 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"
@@ -936,51 +965,56 @@ 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 "Dobro dosli u GRUB izbornik operativnih sustava!"
 
 #. -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 "Za mijenjanje izabranog sustava pritisnite tipke %c i %c."
 
 #. -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 "Pritisnite ENTER za bootiranje izabranog OS, 'e' za promjenu"
 
 #. -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 "naredbe prije bootiranja ili 'c' za komandnu liniju."
 
 #. -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 "Osvjetljeni zapis biti �e bootiran automatski za %d sekundi."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "nema dovoljno mjesta u /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 "Radna povr�ina"
 
 #. -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 "Gdje �elite instalirati bootloader?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "nema jo� implementirane pomo�i.\n"
@@ -993,523 +1027,694 @@ msgstr "Postava Stila Podizanja"
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Datoteka/_Nova"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Datoteka/_Otvori"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Datoteka/_Spremi"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Datoteka/Spremi K_ao"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Datoteka/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Datoteka/_Izlaz"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Opcije"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Opcije/Test"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Pomo�"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/_Pomo�/_O programu..."
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Podesi"
-
-#: ../../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 ""
-"Trenutno koristite %s kao Upravitelj Boot-a.\n"
-"Pritisnite na Podesi za pokretanje �arobnjaka za postavljanje."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Lilo/grub mod"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "Novi stil kategoriziranja Monitora"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "NoviStil Monitora"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "Tradicionalni Monitor"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "Tradicionalni Gtk+ Monitor"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "Pokreni Auroru pri podizanju"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/grub mod"
+
+#: ../../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 ""
+"Trenutno koristite %s kao Upravitelj Boot-a.\n"
+"Pritisnite na Podesi za pokretanje �arobnjaka za postavljanje."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Podesi"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Boot mod"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Sistemski mod"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "Pokreni X-Window sustav pri podizanju"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Ne, ne �elim automatsko prijavljivanje"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Da, �elim automatsko prijavljivanje sa ovim korisnikom i okru�jem"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Sistemski mod"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Uobi�ajeno"
-
-#: ../../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 "U redu"
 
-#: ../../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 "Odustani"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "ne mogu otvoriti /etc/inittab za �itanje: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "ne mogu otvoriti /etc/sysconfig/autologin za �itanje: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "ne mogu otvoriti /etc/inittab za �itanje: %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 "Instalacija LILO-a nije uspjela. Prijavljena je slijede�a gre�ska:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Napravi"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Demontiraj"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Obri�i"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatiraj"
+#: ../../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 "Promijeni veli�inu"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Vrsta"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minuta"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "To�ka montiranja"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minuta"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Zapi�i u /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekundi"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Normalno > Ekspert"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Prvo napravite backup podataka"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Prebaci u normalni mod"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Pro�itajte pa�ljivo!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Vrati postavke iz datoteke"
+#: ../../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 ""
+"Ukoliko �elite koristiti aboot morate ostaviti dovoljno mjesta (npr. 2048 "
+"sektora) na\n"
+"po�etku diska"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Spremi u datoteku"
+#: ../../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 "Gre�ka"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "�arobnjak"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Vrati postavke sa diskete"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Novi"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Spremi na disketu"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Ukloni"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "O�isti sve"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "To�ka montiranja"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Formatiraj sve"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Opcije"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Raspodijeli automatski"
+#: ../../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 "Vrsta"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "Sve primarne particije su iskori�tene"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Demontiraj"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Ne mogu dodati niti jednu dodatnu particiju"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Montiraj"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Izaberite akciju"
 
-#: ../../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 ""
-"Ako �elite dodati jo� koju particiju molim obri�ite jednu od particija kako "
-"bi\n"
-"mogli stvoriti jednu extended particiju."
+"Va� sustav sadr�i samo jednu veliku particiju.\n"
+"(Microsoft DOS/Windows obi�no koristi jednu particiju).\n"
+"Preporu�am da promijenite veli�inu particije\n"
+"(kliknite prvo na particiju te onda na \"Promijeni veli�inu\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Nema dovoljno prostora za auto-alokaciju"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Molim kliknite na particiju"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Vrati"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Molim kliknite na particiju"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Zapi�i particijsku tabelu"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Molim kliknite na particiju"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Vi�e"
+#: ../../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 "Detalji"
+
+#: ../../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 "montiranje nije uspjelo"
+
+#: ../../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 "Prazno"
 
-#: ../../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 "Ostali"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Vrste datote�nih sustava:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detalji"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Napravi"
 
-#: ../../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 ""
-"Va� sustav sadr�i samo jednu veliku particiju.\n"
-"(Microsoft DOS/Windows obi�no koristi jednu particiju).\n"
-"Preporu�am da promijenite veli�inu particije\n"
-"(kliknite prvo na particiju te onda na \"Promijeni veli�inu\")"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Umjesto toga koristi ``%s''"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Prvo napravite backup podataka"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Obri�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 "Pro�itajte pa�ljivo!"
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Prvo pritisnite ``Demontiraj''"
 
-#: ../../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 ""
-"Ukoliko �elite koristiti aboot morate ostaviti dovoljno mjesta (npr. 2048 "
-"sektora) na\n"
-"po�etku diska"
+"Nakon mijenjanja tipa particije %s svi podaci na ovoj particiji biti �e "
+"obrisani"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Budite oprezni: ova operacija je opasna"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Gdje �elite montirati ure�aj %s?"
 
-#: ../../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 "Gre�ka"
+#: ../../diskdrake.pm_.c:500
+msgid "Mount options"
+msgstr "Opcije montiranja"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Mjesto montiranja:"
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
+msgstr "Razno"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Ure�aj:"
+#: ../../diskdrake.pm_.c:525
+msgid "Removable media"
+msgstr "Uklonjivi medij"
 
-#: ../../diskdrake.pm_.c:240
-#, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS ure�aj slovo: %s (naga�anje)\n"
+#: ../../diskdrake.pm_.c:532
+msgid "Change type"
+msgstr "Promijeni tip"
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "Vrsta: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Koji datote�ni sustav �elite?"
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "Ime: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:253
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "Start: sector %s\n"
-msgstr "Po�etak: sektor %s\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Veli�ina: %s"
+#: ../../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:256
-#, c-format
-msgid ", %s sectors"
-msgstr ", %s sektora"
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Poslu�itelj"
+
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr "Dijeljeni resurs"
 
-#: ../../diskdrake.pm_.c:258
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Cilindar %d do cilindra %d\n"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Formatiran\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Izaberite akciju"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Nije formatiran\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose another partition"
+msgstr "Izaberite drugu particiju"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Montiran\n"
+#: ../../diskdrake_interactive.pm_.c:188
+msgid "Exit"
+msgstr "Izlaz"
 
-#: ../../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 "Normalno > Ekspert"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback datoteka(e): %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "Prebaci u normalni mod"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Podrazumijevana boot particija\n"
-"  (za MS-DOS boot, ne za LILO)\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Vrati"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Razina %s\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Da ipak nastavim?"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Chunk veli�ina %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Da zavr�im bez spremanja"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-diskovi %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Da zavr�im bez zapisivanje particijske tablice?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Ime loopback datoteke: %s"
+#: ../../diskdrake_interactive.pm_.c:237
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Da li �elite spremiti /etc/fstab promjene?"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Raspodijeli automatski"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "O�isti sve"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Vi�e"
+
+#: ../../diskdrake_interactive.pm_.c:250
+msgid "Hard drive information"
+msgstr "Hard disk informacije"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Nema dovoljno prostora za auto-alokaciju"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Sve primarne particije su iskori�tene"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Ne mogu dodati niti jednu dodatnu particiju"
+
+#: ../../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"
-"�anse su, da je ova particija\n"
-"ustvari particija upravlja�kog programa, vjerojatno\n"
-"biste ju trebali ostaviti.\n"
+"Ako �elite dodati jo� koju particiju molim obri�ite jednu od particija kako "
+"bi\n"
+"mogli stvoriti jednu extended particiju."
+
+#: ../../diskdrake_interactive.pm_.c:285
+msgid "Save partition table"
+msgstr "Spremi particijsku tabelu"
+
+#: ../../diskdrake_interactive.pm_.c:286
+msgid "Restore partition table"
+msgstr "Vrati particijsku tabelu"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Spasi particijsku tabelu"
+
+#: ../../diskdrake_interactive.pm_.c:289
+msgid "Reload partition table"
+msgstr "Ponovno u�itaj particijsku tabelu"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Automatsko montiranje uklonjivog (removable) medija"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Odaberite datoteku"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../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"
-"Ova specijalna bootstrap\n"
-"particija je za\n"
-"dvostruko-podizanje (dual-boot) va�eg sustava.\n"
+"Backup particijske tablice nema istu veli�inu\n"
+"Da ipak nastavim?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Molim kliknite na particiju"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Upozorenje"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Veli�ina: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Umetnite disketu u pogon\n"
+"Svi podaci na disketi biti �e izbrisani"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometrija: %s cilindara, %s glava, %s sektora\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Poku�avam spasiti particijsku tablicu"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-diskovi %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+msgid "Detailed information"
+msgstr "Detaljne informacije"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Vrsta particijske tabele: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Promijeni veli�inu"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "na sabirnici %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Premjesti"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Montiraj"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatiraj"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Dodaj RAID-u"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Ukloni sa RAID-a"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Promijeni RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Dodaj LVM-u"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Ukloni sa RAID-a"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Ukloni sa LVM-a"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Promijeni RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Koristi za loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Izaberite akciju"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Stvori novu particiju"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Po�etni sektor:"
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Veli�ina u MB:"
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Vrsta datote�nog sustava:"
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Mjesto montiranja:"
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Postavke:"
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Formatiram loopback datoteku %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Mijenjam tip particije"
+
+#: ../../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 "Gdje �elite montirati loopback datoteku %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 mogu maknuti to�ku za montiranje zato �to se ova particija koristi za "
+"loop back.\n"
+"Uklonite loopback prvo"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Izra�unavam granice fat datote�nog sustava"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Mijenjam veli�inu"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Ova particija nije promjenjiva u veli�ini"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Preporu�am da prvo backupirate sve podatke s ove particije"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"Nakon mijenjanja veli�ine particije %s svi podaci na ovoj particiji biti �e "
+"izgubljeni"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Odaberite novu veli�inu"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Veli�ina u MB:"
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Na koji disk se �elite premjestiti?"
+
+#: ../../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 koji se sektor �elite premjestiti?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Premje�tam"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Premje�tam particiju..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Izaberite postoje�i RAID na koji �elite dodati "
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "novi"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Izaberite postoje�i LVM na koji �elite dodati "
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM ime?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Ova particija se ne mo�e koristiti za loopback"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Ime loopback datoteke:"
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Puno ime"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr ""
+"Datoteku koristi neki drugi loopback. Molim izaberite neku drugu datoteku"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Datoteka ve� postoji. Da li da nju upotrijebim?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "ure�aj"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "razina"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "chunk veli�ina"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Budite oprezni: ova operacija je opasna"
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Kakav tip particioniranja?"
+
+#: ../../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,7 +1726,7 @@ msgstr ""
 "Imate dvije opcije ili �ete koristiti LILO pa ne�e raditi ili ne�ete\n"
 "koristiti LILO pa vam /boot ne�e ni trebati."
 
-#: ../../diskdrake.pm_.c:439
+#: ../../diskdrake_interactive.pm_.c:838
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -1533,7 +1738,7 @@ msgstr ""
 "Ukoliko planirate koristiti LILO boot menad�er, budite pa�ljivi da dodate/"
 "boot particiju"
 
-#: ../../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"
@@ -1543,285 +1748,241 @@ msgstr ""
 "Nema bootloader-a koji je u mogu�nosti to podr�ati bez /boot particije.\n"
 "Zato budite pa�ljivi da dodate /boot particiju"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Use ``%s'' instead"
-msgstr "Umjesto toga koristi ``%s''"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Prvo pritisnite ``Demontiraj''"
-
-#: ../../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 ""
-"Nakon mijenjanja tipa particije %s svi podaci na ovoj particiji biti �e "
-"obrisani"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Da ipak nastavim?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Da zavr�im bez spremanja"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Da zavr�im bez zapisivanje particijske tablice?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Mijenjam tip particije"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Koji datote�ni sustav �elite?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "ReiserFS se ne mo�e koristiti na particijama koje su manje od 32 MB"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Gdje �elite montirati loopback datoteku %s?"
-
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Gdje �elite montirati ure�aj %s?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Particijska tablica pogona %s �e sada biti zapisana na disk!"
 
-#: ../../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 mogu maknuti to�ku za montiranje zato �to se ova particija koristi za "
-"loop back.\n"
-"Uklonite loopback prvo"
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Trebate ponovo pokrenuti sustav prije nego promjene postanu aktivne"
 
-#: ../../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 ""
 "Nakon formatiranja particije %s svi podaci na ovoj particiji biti �e obrisani"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Formatiram"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatiram loopback datoteku %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 "Formatiram particiju %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Poslije formatiranja svih particija,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "svi podaci na ovim particijama biti �e izgubljeni"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Premjesti"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Na koji disk se �elite premjestiti?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sektor"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid nije uspio"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Na koji se sektor �elite premjestiti?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Nema dovoljno slobodnog prostora za pravljenje novih particija"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Premje�tam"
+#: ../../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 "Premje�tam particiju..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Nema dovoljno slobodnog prostora za pravljenje novih particija"
 
-#: ../../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 "Particijska tablica pogona %s �e sada biti zapisana na disk!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Trebate ponovo pokrenuti sustav prije nego promjene postanu aktivne"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Rezolucija: %s\n"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Izra�unavam granice fat datote�nog sustava"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Ure�aj:"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Mijenjam veli�inu"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS ure�aj slovo: %s (naga�anje)\n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Ova particija nije promjenjiva u veli�ini"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Vrsta: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Preporu�am da prvo backupirate sve podatke s ove particije"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Ime: "
 
-#: ../../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 ""
-"Nakon mijenjanja veli�ine particije %s svi podaci na ovoj particiji biti �e "
-"izgubljeni"
+msgid "Start: sector %s\n"
+msgstr "Po�etak: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Odaberite novu veli�inu"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Veli�ina: %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 sektora"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Stvori novu particiju"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Cilindar %d do cilindra %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Po�etni sektor:"
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Formatiran\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Veli�ina u MB:"
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Nije formatiran\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Vrsta datote�nog sustava:"
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Montiran\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Postavke:"
+#: ../../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 "Ova particija se ne mo�e koristiti za loopback"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Loopback datoteka(e): %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 ""
+"Podrazumijevana boot particija\n"
+"  (za MS-DOS boot, ne za LILO)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Ime loopback datoteke:"
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Razina %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr ""
-"Datoteku koristi neki drugi loopback. Molim izaberite neku drugu datoteku"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Chunk veli�ina %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Datoteka ve� postoji. Da li da nju upotrijebim?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-diskovi %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Odaberite datoteku"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Ime loopback datoteke: %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 particijske tablice nema istu veli�inu\n"
-"Da ipak nastavim?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Upozorenje"
+"\n"
+"�anse su, da je ova particija\n"
+"ustvari particija upravlja�kog programa, vjerojatno\n"
+"biste ju trebali ostaviti.\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 ""
-"Umetnite disketu u pogon\n"
-"Svi podaci na disketi biti �e izbrisani"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Poku�avam spasiti particijsku tablicu"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "ure�aj"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "razina"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "chunk veli�ina"
+"\n"
+"Ova specijalna bootstrap\n"
+"particija je za\n"
+"dvostruko-podizanje (dual-boot) va�eg sustava.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Izaberite postoje�i RAID na koji �elite dodati "
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Veli�ina: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "novi"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometrija: %s cilindara, %s glava, %s sektora\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Izaberite postoje�i LVM na koji �elite dodati "
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "LVM ime?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-diskovi %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Automatsko montiranje uklonjivog (removable) medija"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Vrsta particijske tabele: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Vrati particijsku tabelu"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "na sabirnici %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Ponovo u�itaj"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Opcije: %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 formatiranje %s nije uspjelo"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "ne znam kako formatirati %s kao vrstu %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "montiranje nije uspjelo"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr "fsck neuspje�an sa izlaznim kodom %d ili signalom %d"
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
-msgstr "montiranje nije uspjelo:"
+msgstr "montiranje nije uspjelo: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "gre�ka kod demontiranja %s: %s"
@@ -1834,41 +1995,44 @@ msgstr "jednostavno"
 msgid "server"
 msgstr "poslu�itelj"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "JFS se ne mo�e koristiti na particijama koje su manje od 16 MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "ReiserFS se ne mo�e koristiti na particijama koje su manje od 32 MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Mjesto montiranja mora po�eti sa /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Ve� postoji particija sa mjestom montiranja %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Kru�no montiranje %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 "Ne mo�ete koristiti LVM logi�ki prostor za mjesto montiranja %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Ovaj direktorij bi trebao ostati unutar root datote�nog sustava"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Treba vam istinski datote�ni sustav (ex2, reiserfs) za ovo mjesto "
 "montiranja\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Gre�ka prilikom otvaranja %s za pisanje: %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"
@@ -1877,342 +2041,411 @@ msgstr ""
 "bih mogao instalirati datote�ni sustav. Provjerite da li je sa va�im "
 "hardverom sve u redu."
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Nemate niti jednu particiju!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr ""
-"Molimo, izaberite preferirani jezik za instalaciju i kori�tenje sustava."
-
-#: ../../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 ""
-"Trebate prihvatiti stavke gorenje licence da bi nastavili instalaciju.\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"
-"Molimo kliknite na \"Prihvati\" ukoliko se sla�ete sa njezinim stavkama.\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"
-"Molimo kliknite na \"Odbij\" ukoliko se ne sla�ete sa njezinim stavkama.\n"
-"Instalacija �e zavr�iti bez ikakvih promjena na va�oj trenutnoj postavi."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr ""
-"Izaberite raspored tipkovnice koji se podudara sa va�om na gornjem popisu"
-
-#: ../../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 ""
-"Ukoliko �elite drugi jezik (od onoga kojega ste odabrali\n"
-"na po�etku instalacije) da bude raspolo�iv poslije instalacije, molimo "
-"odaberite ga u popisu gore. Ako �elite odabrati sve, izaberite samo \"Sve\"."
-
-#: ../../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 ""
+"Gore su popisane postoje�e Linux particije prona�ene na\n"
+"va�em hard disku. Mo�ete zadr�ati izbore napravljene od strane �arobnjaka, "
+"one su dobre za\n"
+"uobi�ajenu upotrebu. Ukoliko promjenite izbore, morate barem definirati "
+"root\n"
+"particiju (\"/\"). Nemojte izabrati premalu particiju jer ne�ete mo�i \n"
+"instalirati dovoljno software-a. Ako �elite spremati va�e podatke na "
+"posebnoj particiji,\n"
+"trebate tako�er izabrati \"/home\" (jedino mogu�e ako imate vi�e od jedne\n"
+"raspolo�ive Linux particije).\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
 "\n"
+"Za informaciju, svaka particija je popisana kako slijedi: \"Ime\", "
+"\"Kapacitet\".\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"
+"\"Ime\" je kodirano kako slijedi: \"tip hard diska\", \"broj hard diska\",\n"
+"\"broj particije\" (naprimjer, \"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"
+"\"Tip hard diska\" je \"hd\" ukoliko je hard disk - IDE hard disk i \"sd\"\n"
+"ukoliko je on SCSI hard disk.\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 ""
-"Molimo izaberite \"Instalacija\" ukoliko nemate prethodne verzijeLinux-"
-"Mandrake-a\n"
-"instalirano ili ako �elite koristiti nekoliko operativnih sustava.\n"
+"\"Broj hard diska\" je uvijek slovo poslije \"hd\" ili \"sd\". Sa IDE hard "
+"diskovima:\n"
 "\n"
+"   * \"a\" zna�i \"master hard disk na primarnom IDE kontroleru\",\n"
 "\n"
-"Molimo izaberite \"Dogradnja\" ukoliko �elite dograditi ve� postoje�u "
-"verzijuLinux-Mandrake-a.\n"
+"   * \"b\" zna�i \"slave hard disk na primarnom IDE kontroleru\",\n"
 "\n"
+"   * \"c\" zna�i \"master hard disk na sekundarnom IDE kontroleru\",\n"
 "\n"
-"U zavisnosti od znanja u GNU/Linux, mo�ete izabrati jednu od slijede�ih "
-"razina za instalaciju ili dogradnju\n"
-"va�eg Linux-Mandrake operativnog sustava:\n"
+"   * \"d\" zna�i \"slave hard disk na sekundarnom IDE kontroleru\".\n"
 "\n"
-"\t* Preporu�eno: ukoliko nikad niste instalirali GNU/Linux operativni sustav "
-"izaberite ovo. Instalacija �e biti\n"
-"\t  vrlo laka i pitati �e vas samo nekoliko pitanja.\n"
 "\n"
+"Sa SCSI hard diskovima, \"a\" zna�i \"primarni hard disk\", \"b\" zna�i "
+"\"sekundarni hard disk\", itd..."
+
+#: ../../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* Prilago�eno: ukoliko ste ve� upoznati sa GNU/Linux, mo�ete izabrati "
-"primarnu upotrebu (radna stanica, poslu�itelj,\n"
-"\t  razvoj) za va� sustav. Trebati �ete odgovoriti na vi�e pitanja nego u "
-"\"Preporu�enoj\" instalacijskoj\n"
-"\t  klasi, zato trebate znati vi�e o tome kako GNU/Linux radi kako bi "
-"izabrali ovu instalacijsku klasu.\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* Stru�njak: ukoliko imate dobro znanje o GNU/Linux-u, mo�ete izabrati ovu "
-"instalacijsku klasu. Kao u \"Prilago�enoj\"\n"
-"\t  instalacijskoj klasi, mo�i �ete izabrati primarnu upotrebu za va� sustav "
-"(radna stanica, poslu�itelj, razvoj). Budite jako\n"
-"\t  pa�ljivi prije nego �to odaberete ovu instalacijsku klasu. Mo�i �ete "
-"izvr�iti visoko prilago�enu instalaciju.\n"
-"\t  Odgovori na neka pitanja mogu biti jako te�ki ukoliko nemate dobro "
-"znanje GNU/Linux. Dakle, nemojte izabrati\n"
-"\t  ovu instalacijsku klasu ukoliko ne znate �to radite."
-
-#: ../../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 ""
-"Odaberite:\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"
-"  - Prilago�eno: Ukoliko ste upoznati s Linuxom kori�tenjem ove\n"
-"opcije mo�i �e te odabrati kakvu instalaciju �elite npr. normalna, "
-"programer\n"
-"ili poslu�itelj. Odaberite \"Normalna\" za sustav op�e namjene.\n"
-"Odaberite \"Programer\" ako �elite koristiti ra�unalo primarno za razvoj\n"
-"softvera ili odaberite \"Poslu�itelj\" ako �elite koristiti ra�unalo kao\n"
-"poslu�itelj op�e namjene npr. za mail, web, ispisivanje itd.\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"
-"  - Stru�njak: Ukoliko ste vrlo dobro upoznati sa Linuxom i �elite\n"
-"imati potpunu kontrolu nad instalacijom Linuxa odaberite opciju\n"
-"\"Stru�njak\". Sli�no kao i sa \"Prilago�eno-m\" instalacijom mo�i\n"
-"�e te odabrati kako �e se sustav upotrebljavati me�utim sa dodatnim opcijama."
+"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 ""
-"Sada morate definirati upotrebu va�eg ra�unala. Izbori su:\n"
-"\n"
-"\t* Radna stanica: ovo je idealan izbor ukoliko planirate koristiti va�e "
-"ra�unalo primarno za svakodnevno kori�tenje, u uredu ili\n"
-"\t  kod ku�e.\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* Razvoj: ukoliko planirate koristiti va�e ra�unalo primarno za razvoj "
-"software-a, to je dobar izbor. Tada\n"
-"\t  �ete imati kompletnu kolekciju instaliranog software-a u pravilu da "
-"kompajlirate, uklanjate gre�ke, i formatirate izvorni kod,\n"
-"\t  ili za pravljenje softwareskih paketa.\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* Poslu�itelj: ukoliko planirate koristiti ovo ra�unalo kao poslu�itelj, "
-"ovo je dobar izbor. Ili kao datote�ni poslu�itelj (NFS ili\n"
-"\t  SMB), poslu�itelj pisa�a (Unix stil ili Microsoft Windows stil), "
-"autentifikacijski poslu�itelj (NIS), poslu�itelj\n"
-"\t  baze podataka i tako dalje. Kao takav, ne o�ekujte da �e biti ljepote "
-"(KDE, GNOME, itd.) instalirane."
+"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 ""
-"DrakX �e poku�ati prona�i PCI SCSI adapter(e). Ukoliko DrakX\n"
-"prona�e SCSI adapter i zna koji upravlja�ki program da koristi, on �e "
-"automatski biti\n"
-"instaliran.\n"
+"Sada mo�ete izabrati servise koje �elite pokreniti pri podizanju.\n"
 "\n"
 "\n"
-"Ukoliko nemate SCSI adapter, ISA SCSI adapter ili PCI SCSI adapter koji\n"
-"DrakX ne mo�e prepoznati, biti �ete pitani da li imate SCSI adapter u va�em\n"
-"sustavu. Ukoliko nemate adapter, mo�ete kliknuti na \"Ne\". Ukoliko kliknete "
-"na\n"
-"\"Da\", dobiti �ete popis upravlja�kih programa odakle mo�ete izabrati va�\n"
-"specifi�an adapter.\n"
+"Kada va� mi� pre�e preko jedinke, mala balonska pomo� �e se pojaviti koja "
+"�e\n"
+"opisati ulogu tog servisa.\n"
 "\n"
 "\n"
-"Ako trebate ru�no specifirati va� adapter, DrakX �e pitati da li �elite \n"
-"specifirati opcije za njega. Trebali biste dozvoliti DrakX-u da isproba "
-"opcije za\n"
-"hardware. Ovo obi�no radi dobro.\n"
+"Budite vrlo pa�ljivi u ovom koraku ako planirate koristiti ovo ra�unalo kao "
+"poslu�itelj: vjerojatno\n"
+"ne�ete �eliti pokrenuti neke servise koje ne trebate. Molimo\n"
+"zapamtite da neki servisi mogu biti opasni ukoliko su omogu�eni na "
+"poslu�itelju.\n"
+"Op�enito, izaberite samo one servise koje �e te zaista trebati."
+
+#: ../../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 ""
+"Linux koristi GMT (Srednje vrijeme po Greenwichu) koje onda prera�unava\n"
+"u lokalno vrijeme u va�oj vremenskoj zoni koje ste odabrali."
+
+#: ../../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"
-"Ako ne, trebati �ete navesti opcije za upravlja�ki program. Molimo "
-"pregledajte User\n"
-"Guide (poglavlje 3, sekciju \"Collective informations on your hardware) za "
-"preporuke\n"
-"o pribavljanju ovih informacija iz dokumentacije hardware-a, sa \n"
-"proizvo�a�evog Web site-a (ukoliko imate Internet pristup) ili iz Microsoft "
-"Windows-a\n"
-"(ukoliko ga imate na va�em sustavu)."
+"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 ""
 "U ovom trenutku, trebate izabrati gdje �ete instalirati va�\n"
-"Linux-Mandrake operativni sustav na va� hard disk. Ukoliko je prazan ili "
+"Mandrake Linux operativni sustav na va� hard disk. Ukoliko je prazan ili "
 "ako\n"
 "postoje�i operativni sustav koristi �itav prostor na disku, trebate ga\n"
 "particionirati. Jednostavno, particioniranje hard diska sastoji se od "
 "logi�kog\n"
-"dijeljenja kako bi napravili prostor za instalaciju va�eg novog Linux-"
-"Mandrake sustava.\n"
+"dijeljenja kako bi napravili prostor za instalaciju va�eg novog Mandrake "
+"Linux sustava.\n"
 "\n"
 "\n"
 "Zato �to su posljedice procesa particioniranja obi�no ireverzibilne,\n"
@@ -2238,128 +2471,240 @@ msgstr ""
 "va�ih hard disk\n"
 "postavki, nekoliko rje�enja je raspolo�ivo:\n"
 "\n"
-"\t* Kori�tenje postoje�e particije: �arobnjak je detektirao jednu ili vi�e "
+"* Kori�tenje postoje�e particije: �arobnjak je detektirao jednu ili vi�e "
 "postoje�ih Linux particija na va�em hard disku. Ukoliko\n"
-"\t  ih �elite zadr�ati, izaberite ovu opciju.\n"
+"  ih �elite zadr�ati, izaberite ovu opciju.\n"
 "\n"
 "\n"
-"\t* Obri�i cijeli disk: ukoliko �elite obrisati sve podatke i sve particije "
+"* Obri�i cijeli disk: ukoliko �elite obrisati sve podatke i sve particije "
 "koje postoje na va�em hard disku i zamjeniti ih sa\n"
-"\t  va�im novim Linux-Mandrake sustavom, mo�ete izabrati ovu opciju. Budite "
+"  va�im novim Mandrake Linux sustavom, mo�ete izabrati ovu opciju. Budite "
 "pa�ljivi sa ovim rje�enjem, ne�ete mo�i\n"
-"\t  povratiti va� izbor nakon potvrde.\n"
+"  povratiti va� izbor nakon potvrde.\n"
 "\n"
 "\n"
-"\t* Koristiti slobodan prostor na Windows particiji: ukoliko je Microsoft "
+"* Koristiti slobodan prostor na Windows particiji: ukoliko je Microsoft "
 "Windows instaliran na va�em hard disku i zauzima\n"
-"\t  cjeli raspolo�iv prostor na njemu, trebate napraviti slobodan prostor za "
+"  cjeli raspolo�iv prostor na njemu, trebate napraviti slobodan prostor za "
 "Linux podatke. Da biste to napravili mo�ete obrisati va�u\n"
-"\t  Microsoft Windows particiju i podatke (pogledajte \"Brisanje cijelog "
-"diska\" ili \"Ekspert mod\" rje�enja) ili mjenjati veli�inu va�e\n"
-"\t  Microsoft Windows particije. Mjenjanje veli�ine mo�e se obaviti bez "
+"  Microsoft Windows particiju i podatke (pogledajte \"Brisanje cijelog diska"
+"\" ili \"Ekspert mod\" rje�enja) ili mjenjati veli�inu va�e\n"
+"  Microsoft Windows particije. Mjenjanje veli�ine mo�e se obaviti bez "
 "gubitka bilo kakvih podataka. Ovo rje�enje je\n"
-"\t  preporu�eno ukoliko �elite koristiti zajedno Linux-Mandrake i Microsoft "
+"  preporu�eno ukoliko �elite koristiti zajedno Mandrake Linux i Microsoft "
 "Windows-e na istom ra�unalu.\n"
 "\n"
 "\n"
-"\t  Prije izabiranja ovog rje�enja, molimo razumite da �e veli�ina va�e "
+"  Prije izabiranja ovog rje�enja, molimo razumite da �e veli�ina va�e "
 "Microsoft\n"
-"\t  Windows partiticije biti manja nego �to je sada. To zna�i da �ete imati "
+"  Windows partiticije biti manja nego �to je sada. To zna�i da �ete imati "
 "manje slobodnog prostora pod\n"
-"\t  Microsoft Windows-ima za spremanje va�ih podataka ili instaliranje novog "
+"  Microsoft Windows-ima za spremanje va�ih podataka ili instaliranje novog "
 "software-a.\n"
 "\n"
 "\n"
-"\t* Ekspertni mod: Ukoliko �elite particionirati ru�no va� hard disk, mo�ete "
+"* Ekspertni mod: Ukoliko �elite particionirati ru�no va� hard disk, mo�ete "
 "izabrati ovu opciju. Budite pa�ljivi prije\n"
-"\t  izabiranja ovog rje�enja. Vrlo je mo�no, ali i vrlo opasno. Mo�ete "
+"  izabiranja ovog rje�enja. Vrlo je mo�no, ali i vrlo opasno. Mo�ete "
 "izgubiti sve va�e podatke vrlo lako. Zato,\n"
-"\t  nemojte izabrati ovo rje�enje ukoliko ne znate �to radite."
+"  nemojte izabrati ovo rje�enje ukoliko ne znate �to radite."
 
-#: ../../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"
+"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"
-"   * 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 ""
+"Svaka particija koja je novo definirana mora biti\n"
+"formatirana za kori�tenje (formatiranje zna�i pravljenje datote�nog "
+"sustava).\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"
+"Trenutno, mo�ete htjeti ponovno formatirati neke ve� postoje�e particije "
+"kako bi obrisali\n"
+"podatke koje one posjeduju. Ukoliko �elite to napraviti, molimo tako�er "
+"izaberite particije\n"
+"koje �elite formatirati.\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"
+"Molimo primjetite da nije nu�no ponovno formatirati sve ve� postoje�e "
+"particije.\n"
+"Morate ponovno formatirati particije koje sadr�e operativni sustav (poput \"/"
+"\",\n"
+"\"/usr\" ili \"/var\") ali ne morate ponovno formatirati particije koje "
+"sadr�e podatke\n"
+"koje �elite zadr�ati (tipi�no /home).\n"
 "\n"
-"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
+"Molimo budite pa�ljivi odabirom particija, poslije formatiranja, svi podaci "
+"�e biti\n"
+"obrisani i ne�ete ih mo�i povratiti.\n"
 "\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
 "\n"
+"Pritisnite na \"U redu\" kada ste spremni za formatiranje particije.\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"
+"Pritisnite na \"Odustani\" kada �elite izabrati druge particije za "
+"instalaciju va�eg novog\n"
+"Mandrake Linux operativnog sustava."
+
+#: ../../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 ""
+"Va� novi Mandrake Linux operativni sustav se trenutno instalira.\n"
+"Ova operacija bi trebala trajati nekoliko minuta (ovisi o veli�ini\n"
+"instalacije koju ste odabrali i brzini va�eg ra�unala).\n"
+"\n"
+"\n"
+"Molimo budite strpljivi."
+
+#: ../../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"
-"   * 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"
+"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"
-"   * 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 ""
 "U ovoj to�ki instalacije, trebate izabrati koje\n"
-"partiticije �ete koristiti za instalaciju va�eg novog Linux-Mandrake "
+"partiticije �ete koristiti za instalaciju va�eg novog Mandrake Linux "
 "sustava. Ukoliko su\n"
 "particije ve� definirane (iz prethodne instalacije GNU/Linux-a ili iz\n"
 "drugih particijskih alata), mo�ete koristiti postoje�e particije. U drugim "
@@ -2435,169 +2780,43 @@ msgstr ""
 "particije, recimo 50MB, mo�ete ju prona�i korisnom za stavljanje\n"
 "dodatnog kernela i ramdisk slike u slu�aju nu�de."
 
-#: ../../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"
-"\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\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\" 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 ""
-"Gore su popisane postoje�e Linux particije prona�ene na\n"
-"va�em hard disku. Mo�ete zadr�ati izbore napravljene od strane �arobnjaka, "
-"one su dobre za\n"
-"uobi�ajenu upotrebu. Ukoliko promjenite izbore, morate barem definirati "
-"root\n"
-"particiju (\"/\"). Nemojte izabrati premalu particiju jer ne�ete mo�i \n"
-"instalirati dovoljno software-a. Ako �elite spremati va�e podatke na "
-"posebnoj particiji,\n"
-"trebate tako�er izabrati \"/home\" (jedino mogu�e ako imate vi�e od jedne\n"
-"raspolo�ive Linux particije).\n"
-"\n"
-"\n"
-"Za informaciju, svaka particija je popisana kako slijedi: \"Ime\", "
-"\"Kapacitet\".\n"
-"\n"
-"\n"
-"\"Ime\" je kodirano kako slijedi: \"tip hard diska\", \"broj hard diska\",\n"
-"\"broj particije\" (naprimjer, \"hda1\").\n"
-"\n"
-"\n"
-"\"Tip hard diska\" je \"hd\" ukoliko je hard disk - IDE hard disk i \"sd\"\n"
-"ukoliko je on SCSI hard disk.\n"
-"\n"
-"\n"
-"\"Broj hard diska\" je uvijek slovo poslije \"hd\" ili \"sd\". Sa IDE hard "
-"diskovima:\n"
-"\n"
-"   * \"a\" zna�i \"master hard disk na primarnom IDE kontroleru\",\n"
-"\n"
-"   * \"b\" zna�i \"slave hard disk na primarnom IDE kontroleru\",\n"
-"\n"
-"   * \"c\" zna�i \"master hard disk na sekundarnom IDE kontroleru\",\n"
-"\n"
-"   * \"d\" zna�i \"slave hard disk na sekundarnom IDE kontroleru\".\n"
-"\n"
-"\n"
-"Sa SCSI hard diskovima, \"a\" zna�i \"primarni hard disk\", \"b\" zna�i "
-"\"sekundarni hard disk\", itd..."
-
-#: ../../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 ""
-"Izaberite hard disk kojeg �elite obrisati kako bi instalirali va�u\n"
-"novu Linux-Mandrake particiju. Budite pa�ljivi, svi postoje�i podaci biti �e "
-"izgubljeni\n"
-"i ne�e se mo�i povratiti."
-
-#: ../../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 ""
-"Izaberite \"U redu\" ukoliko �elite obrisati sve podatke i\n"
-"postoje�e particije na navedenom hard disku. Budite pa�ljivi, nakon "
-"klikanja\n"
-"na \"U redu\", ne�ete mo�i povratiti bilo kakve postoje�e podatke ili "
-"particije\n"
-"na ovom hard disku, uklju�uju�i Windows podatke.\n"
-"\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"Pritisnite na \"Odustani\" za prekidanje ove operacije bez gubljenja bilo\n"
-"kakvih postoje�ih podataka i particija na ovom hard disku."
-
-#: ../../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"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\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"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc.\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 ""
 "Vi�e od jedne Microsoft Windows particije su prona�ene\n"
 "na va�em hard disku. Molimo izaberite jednu kojoj �elite promjeniti veli�inu "
 "kako bi instalirali\n"
-"va� novi Linux-Mandrake operativni sustav.\n"
+"va� novi Mandrake Linux operativni sustav.\n"
 "\n"
 "\n"
 "Za informaciju, svaka particija je popisana kako slijedi; \"Linux ime\", "
@@ -2631,935 +2850,500 @@ msgstr ""
 "\"Windows ime\" je slovo va�eg hard diska pod Windows-ima (prvi disk\n"
 "ili particija se zove \"C:\")."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr "Molimo budite strpljivi. Ova operacija mo�e potrajati nekoliko minuta."
 
-#: ../../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"
-"\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"
+" * 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 ""
-"Svaka particija koja je novo definirana mora biti\n"
-"formatirana za kori�tenje (formatiranje zna�i pravljenje datote�nog "
-"sustava).\n"
-"\n"
+"Molimo izaberite \"Instalacija\" ukoliko nemate prethodne verzijeMandrake "
+"Linux-a\n"
+"instalirano ili ako �elite koristiti nekoliko operativnih sustava.\n"
 "\n"
-"Trenutno, mo�ete htjeti ponovno formatirati neke ve� postoje�e particije "
-"kako bi obrisali\n"
-"podatke koje one posjeduju. Ukoliko �elite to napraviti, molimo tako�er "
-"izaberite particije\n"
-"koje �elite formatirati.\n"
 "\n"
+"Molimo izaberite \"Dogradnja\" ukoliko �elite dograditi ve� postoje�u "
+"verzijuMandrake Linux-a.\n"
 "\n"
-"Molimo primjetite da nije nu�no ponovno formatirati sve ve� postoje�e "
-"particije.\n"
-"Morate ponovno formatirati particije koje sadr�e operativni sustav (poput \"/"
-"\",\n"
-"\"/usr\" ili \"/var\") ali ne morate ponovno formatirati particije koje "
-"sadr�e podatke\n"
-"koje �elite zadr�ati (tipi�no /home).\n"
 "\n"
+"U zavisnosti od znanja u GNU/Linux, mo�ete izabrati jednu od slijede�ih "
+"razina za instalaciju ili dogradnju\n"
+"va�eg Mandrake Linux operativnog sustava:\n"
 "\n"
-"Molimo budite pa�ljivi odabirom particija, poslije formatiranja, svi podaci "
-"�e biti\n"
-"obrisani i ne�ete ih mo�i povratiti.\n"
+"* Preporu�eno: ukoliko nikad niste instalirali GNU/Linux operativni sustav "
+"izaberite ovo. Instalacija �e biti\n"
+"  vrlo laka i pitati �e vas samo nekoliko pitanja.\n"
 "\n"
 "\n"
-"Pritisnite na \"U redu\" kada ste spremni za formatiranje particije.\n"
+"* Prilago�eno: ukoliko ste ve� upoznati sa GNU/Linux, mo�ete izabrati "
+"primarnu upotrebu (radna stanica, poslu�itelj,\n"
+"  razvoj) za va� sustav. Trebati �ete odgovoriti na vi�e pitanja nego u "
+"\"Preporu�enoj\" instalacijskoj\n"
+"  klasi, zato trebate znati vi�e o tome kako GNU/Linux radi kako bi izabrali "
+"ovu instalacijsku klasu.\n"
 "\n"
 "\n"
-"Pritisnite na \"Odustani\" kada �elite izabrati druge particije za "
-"instalaciju va�eg novog\n"
-"Linux-Mandrake operativnog sustava."
+"* Stru�njak: ukoliko imate dobro znanje o GNU/Linux-u, mo�ete izabrati ovu "
+"instalacijsku klasu. Kao u \"Prilago�enoj\"\n"
+"  instalacijskoj klasi, mo�i �ete izabrati primarnu upotrebu za va� sustav "
+"(radna stanica, poslu�itelj, razvoj). Budite jako\n"
+"  pa�ljivi prije nego �to odaberete ovu instalacijsku klasu. Mo�i �ete "
+"izvr�iti visoko prilago�enu instalaciju.\n"
+"  Odgovori na neka pitanja mogu biti jako te�ki ukoliko nemate dobro znanje "
+"GNU/Linux. Dakle, nemojte izabrati\n"
+"  ovu instalacijsku klasu ukoliko ne znate �to radite."
 
-#: ../../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 ""
-"Sada mo�ete odabrati grupu paketa koje �elite\n"
-"instalirati ili nadograditi.\n"
-"\n"
-"\n"
-"DrakX �e tada provjeriti da li imate dovoljno mjesta za instalaciju svih "
-"odabranih. Ako ne,\n"
-"upozoriti �e vas o tome. Ukoliko �elite nastaviti svejedno, on �e nastaviti "
-"sa\n"
-"instalacijom svih odabranih grupa, ali ne�e instalirati neke pakete od "
-"manjeg\n"
-"interesa. Na kraju popisa mo�ete izabrati opciju \n"
-"\"Individualan izbor paketa\"; u tom slu�aju morati �ete pregledati \n"
-"vi�e od 1000 paketa..."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:534
 msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\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 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 ""
-"Sada mo�ete izabrati individualno sve pakete koje\n"
-"�elite instalirati.\n"
-"\n"
-"\n"
-"Mo�ete pro�iriti ili skupiti drvo klikaju�i na opcije u lijevom kutu\n"
-"prozora od paketa.\n"
-"\n"
-"\n"
-"Ukoliko preferirate da vidite pakete sortirane po abecednom redu, pritisnite "
-"na ikonu\n"
-"\"Promjeni ravno i grupno sortirano\".\n"
-"\n"
-"\n"
-"Ukoliko ne �elite biti upozoreni o ovisnosti, pritisnite na \"Automatsku\n"
-"ovisnost\". Ako �elite to, primjetite da odzna�ivanje jednog paketa mo�e "
-"tiho\n"
-"odzna�iti nekoliko drugih paketa koji ovise o njemu."
-
-#: ../../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."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"Ako imate sve gore navedene CDove kliknite U redu.\n"
-"Ako nemate niti jedan od tih navedenih CDa kliknite Odustani.\n"
-"Ako imate samo neke od navedenih CDa odzna�ite one koje nemate i kliknite U "
-"redu."
 
-#: ../../help.pm_.c:369
+#: ../../help.pm_.c:547
 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 ""
-"Va� novi Linux-Mandrake operativni sustav se trenutno instalira.\n"
-"Ova operacija bi trebala trajati nekoliko minuta (ovisi o veli�ini\n"
-"instalacije koju ste odabrali i brzini va�eg ra�unala).\n"
-"\n"
-"\n"
-"Molimo budite strpljivi."
-
-#: ../../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 ""
-"Sada mo�ete istestirati va�eg mi�a. Koristite tipke i kota�i� kako bi\n"
-"provjerili da li su postavke dobre. Ukoliko nisu, kliknite na \"Odustani\"\n"
-"za odabir nekih drugih upravlja�kih programa."
 
-#: ../../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 ""
 "Molim odaberite ispravni port. Npr. COM1 port pod MS Windows-ima\n"
 "je imenovan ttyS0 pod GNU/Linux-om."
 
-#: ../../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 ""
-"Ukoliko �elite spojiti va�e ra�unalo na Internet ili\n"
-"na lokalnu mre�u molimo izaberite ispravnu opciju. Molimo uklju�ite va� "
-"ure�aj\n"
-"prije nego izaberete ispravnu opciju kako bi ga DrakX automatski prepoznao.\n"
-"\n"
-"\n"
-"Ako nemate niti jednu vezu na Internet ili na lokalnu mre�u, izaberite\n"
-"\"Onemogu�i umre�avanje\".\n"
-"\n"
-"\n"
-"Ukoliko �elite konfigurirati mre�u kasnije poslije instalacije ili ako ste \n"
-"zavr�ili sa konfiguriranjem va�e mre�ne veze, izaberite \"Zavr�i\"."
-
-#: ../../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 ""
-"Nije prona�en modem. Molimo izaberite serijski port na kojem je priklju�en.\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"
-"Za informaciju. prvi serijski port (nazvan \"COM1\" pod Microsoft\n"
-"Windows-ima) se zove \"ttyS0\" pod Linux-om."
-
-#: ../../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 ""
-"Sada mo�ete unijeti opcije za pozivanje ISP-a. Ukoliko neznate\n"
-"ili niste sigurni �to unijeti, ispravne informacije mogu se dobiti od va�eg\n"
-"pru�atelja Internet usluga. Ukoliko ne unesete DNS (imenski poslu�itelj)\n"
-"informacije ovdje, te informacije �e biti dobivene od va�eg pru�atelja "
-"Internet\n"
-"usluga pri samom spajanju."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Ukoliko je va� modem vanjski modem, molimo uklju�ite ga sada kako bi ga "
-"DrakX prona�ao automatski."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Molimo uklju�ite va� modem i izaberite ispravan model."
-
-#: ../../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 ""
-"Ukoliko niste sigurni da li su podaci gore\n"
-"to�ni ili neznate �to treba unijeti, ispravne informacije\n"
-"mo�ete dobiti od va�eg pru�atelja internet usluga. Ukoliko ne unesete\n"
-"DNS (imenski poslu�itelj) informacije ovdje, ta �e informacije biti "
-"dobivena\n"
-"od va�eg pru�atelja Internet usluga pri samom spajanju."
-
-#: ../../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 ""
-"Sada mo�ete unijeti ime va�eg ra�unala ukoliko je potrebno. Ukoliko ne\n"
-"znate ili niste sigurni �to trebate unijeti, ispravne informacije mogu\n"
-"biti dobivene od va�eg pru�atelja Internet usluga."
-
-#: ../../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."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Sada mo�ete konfigurirati va� mre�ni ure�aj.\n"
-"\n"
-"  * IP adresu: ukoliko ne znate adresu pitajte svojeg mre�nog administratora "
-"ili  ISP-a.\n"
-"    Ne biste trebali unijeti IP adresu ukoliko ste izabrali opciju "
-"\"Automatskog IP-a\" ispod.\n"
-"\n"
-"  * Mre�na maska: Obi�no je maska \"255.255.255.0\" dobar izbor. Ako niste "
-"sigurni \n"
-"raspitajte se kod mre�nog administratora.\n"
-"\n"
-"  * Automatski IP: Ukoliko va�a mre�a koristi BOOTP ili DHCP protokol, "
-"odaberite ovu\n"
-"opciju. U ovom slu�aju ne morate unijeti ni�ta pod \"IP adresa\". Ako niste "
-"sigurni\n"
-"raspitajte se kod mre�nog administratora."
 
-#: ../../help.pm_.c:443
+#: ../../help.pm_.c:600
 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 ""
-"Sada mo�ete unijeti ime va�eg ra�unala ukoliko je potrebno. Ukoliko\n"
-"ne znate ili niste sigurni �to unijeti, pitajte va�eg mre�nog administratora."
-
-#: ../../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 ""
-"Sada mo�ete unijeti ime va�eg ra�unala ukoliko je potrebno. Ukoliko\n"
-"ne znate ili niste sigurni �to unijeti, ostavite prazno."
-
-#: ../../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 ""
-"Sada mo�ete podesiti dial-up postavke. Ako niste sigurni �to treba\n"
-"unijeti, raspitajte se kod svog ISP-a."
-
-#: ../../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 ""
-"Ako �elite koristiti proxye unesite ih sada. Ako niste sigurni\n"
-"da li imate proxye raspitajte se kod mre�nog administratora ili ISP-a."
-
-#: ../../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"
+"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"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"Sada mo�ete instalirati kriptografske pakete ukoliko imate dobro pode�enu "
-"internetu vezu.\n"
-"Prvo morate odabrati mirror sa kojeg �e te skinuti pakete i\n"
-"nakon toga izabrati pakete koje �elite izabrati.\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"
-"Primjetite da morate izabrati mirror i kriptografske pakete prema va�em\n"
-"zakonodavstvu."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Sada mo�ete izabrati va�u vremensku zonu po tome gdje �ivite."
-
-#: ../../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 ""
-"Linux koristi GMT (Srednje vrijeme po Greenwichu) koje onda prera�unava\n"
-"u lokalno vrijeme u va�oj vremenskoj zoni koje ste odabrali.\n"
-"\n"
-"\n"
-"Ukoliko koristite Microsoft Windows na ovom ra�unalu, izaberite \"Ne\"."
-
-#: ../../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"
+" * \"Boot loader to use\": you have three choices:\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 ""
-"Sada mo�ete izabrati servise koje �elite pokreniti pri podizanju.\n"
-"\n"
-"\n"
-"Kada va� mi� pre�e preko jedinke, mala balonska pomo� �e se pojaviti koja "
-"�e\n"
-"opisati ulogu tog servisa.\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"
-"Budite vrlo pa�ljivi u ovom koraku ako planirate koristiti ovo ra�unalo kao "
-"poslu�itelj: vjerojatno\n"
-"ne�ete �eliti pokrenuti neke servise koje ne trebate. Molimo\n"
-"zapamtite da neki servisi mogu biti opasni ukoliko su omogu�eni na "
-"poslu�itelju.\n"
-"Op�enito, izaberite samo one servise koje �e te zaista trebati."
-
-#: ../../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 ""
-"Mo�ete podesiti lokalni pisa� (spojen na va�e ra�unalo) ili udaljeni\n"
-"pisa� (dostupan preko Unix, Netware ili Microsoft Windows mre�e)."
-
-#: ../../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 ""
-"Ukoliko �elite biti u mogu�nosti ispisivati, molimo izaberite jedan od "
-"ispisnih sustava izme�u\n"
-"CUPS i LPR-a.\n"
-"\n"
-"\n"
-"CUPS je novi, mo�an i fleksibilan ispisni sustav za Unix sustave (CUPS\n"
-"zna�i \"Common Unix Printing System\"). On je podrazumijevani ispisni sustav "
-"u\n"
-"Linux-Mandrake-u.\n"
-"\n"
-"\n"
-"LPR je stari ispisni sustav kori�ten u prija�njim Linux-Mandrake "
-"distribucijama.\n"
-"\n"
-"\n"
-"Ukoliko nemate pisa�, izaberite \"Niti jedan\"."
 
-#: ../../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 ""
-"GNU/Linux mo�e raditi sa mnogim tipovima pisa�a. Svaki od njih zahtjeva\n"
-"razli�ito postavljanje.\n"
-"\n"
-"\n"
-"Ako je va� pisa� fizi�ki povezan na va�e ra�unalo, izaberite \"Lokalni\n"
-"pisa�\".\n"
-"\n"
-"\n"
-"Ukoliko prisitupate pisa�u koji se nalazi na udaljenom Unix ra�unalu, "
-"izaberite\n"
-"\"Udaljeni pisa�\".\n"
+"LILO (the LInux LOader) i Grub su bootloaderi: oni su u mogu�nosti podi�i\n"
+"ili GNU/Linux ili bilo koji drugi postoje�i operativni sustav na va�em "
+"ra�unalu.\n"
+"Normalno, ti drugi operativni sustavi su ispravno prona�eni i\n"
+"instalirani. Ako to nije slu�aj, mo�ete ga dodati ru�no na ovom\n"
+"zaslonu. Budite pa�ljivi da izaberete ispravne parametre.\n"
 "\n"
 "\n"
-"Ako �elite pristupiti pisa�u koji se nalazi na udaljenom Microsoft Windows "
-"ra�unalu\n"
-"(ili na Unix ra�unalu koje koristi SMB protokol), izaberite \"SMB/Windows "
-"95/98/NT\"."
+"Tako�er �ete po�eliti ne dati pristup tim drugim operativnim sustavima\n"
+"drugima, u tom slu�aju mo�ete obrisati odgovaraju�e unose. Ali\n"
+"u tom slu�aju, trebati �ete boot disketu kako bi ih mogli podi�i!"
 
-#: ../../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"
-"\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"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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 ""
-"Molimo uklju�ite va� pisa� prije nego nastaviti kako bi dopustili DrakX-u da "
-"ga prona�e.\n"
-"\n"
-"Trebate unijeti neke informacije ovdje.\n"
-"\n"
-"\n"
-"   * Ime pisa�a: ispisni red koristi \"lp\" kao podrazumijevano ime pisa�a. "
-"Zato, morate imati pisa� imenovan \"lp\".\n"
-"     Ukoliko imate samo jedan pisa�, mo�ete mu dati nekoliko imena. Samo ih "
-"trebate odvojiti sa cijev\n"
-"     karakterom (\"|\"). Zato, ako preferirate neko bolje ime, morate ga "
-"staviti prije, primjer: \"Moj printer|lp\".\n"
-"     Pisa� koji ima \"lp\" u svom imenu biti �e podrazumijevani pisa�.\n"
-"\n"
-"\n"
-"   * Opis: Ovo je opcionalno, ali mo�e biti korisno ukoliko imate nekoliko "
-"pisa�a spojenih na va�e ra�unalo ili ako dozvoljavate\n"
-"     drugim ra�unalim da pristupe ovom pisa�u.\n"
+"Sada mo�ete odabrati gdje �elite\n"
+"staviti informacije potrebne za bootiranje Linuxa.\n"
 "\n"
 "\n"
-"   * Lokacija: ako �elite staviti neke informacije o va�em\n"
-"     polo�aju pisa�a, stavite ju ovdje (slobodni ste napisati �to\n"
-"     �elite. naprimjer \"2 kat\").\n"
+"Ako ne znate �to odabrati odaberite \"Prvi sektor \n"
+"diska (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"
-"\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"
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
-"\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
-msgstr ""
-"Trebate unijeti neke informacije ovdje.\n"
-"\n"
-"\n"
-"   * Ime reda: ispisni red koristi \"lp\" kao podrazumijevano ime pisa�a. "
-"Zato, trebate imati pisa� imenom \"lp\".\n"
-"     Ako imate samo jedan pisa�, mo�ete koristiti nekoliko imena za njega. "
-"Samo ih trebate odvojiti cijev\n"
-"     karakterom (\"|\"). Zato, ako preferirate da imate neko bolje ime, "
-"morate ga staviti prije, primjer: \"Moj printer|lp\".\n"
-"     Pisa� koji ima \"lp\" u svom imenu �e biti podrazumijevani pisa�.\n"
-"\n"
-"\n"
-"   * Veza pisa�a: Ukoliko je va� pisa� fizi�ki spojen na va�e ra�unalo, "
-"izaberite \"Lokalni pisa�\".\n"
-"     Ukoliko �elite pristupiti pisa�u koji se nalazi na udaljenom Unix "
-"ra�unalu, izaberite \"Udaljeni lpd pisa�\".\n"
-"\n"
-"\n"
-"     Ako �elite pristupiti pisa�u koji se nalazi na udaljenom Microsoft "
-"Windows ralunalo (ili na Unix ra�unalu koji koristi SMB\n"
-"     protokol), izaberite \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     Ukoliko �elite pristupiti pisa�u koji se nalazi na NetWare mre�i, "
-"izaberite \"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 ""
-"Va� pisa� nije prona�en. Molimo unesite ime ure�aja na\n"
-"koji je spojen.\n"
+"DrakX �e poku�ati prona�i PCI SCSI adapter(e). Ukoliko DrakX\n"
+"prona�e SCSI adapter i zna koji upravlja�ki program da koristi, on �e "
+"automatski biti\n"
+"instaliran.\n"
 "\n"
 "\n"
-"Za informaciju, ve�ina pisa�a je spojena na prvi paralelni port. On\n"
-"se zove \"/dev/lp0\" pod GNU/Linux-om i \"LPT1\" pod Microsoft Windows-ima."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Sada morate izabrati va� pisa� u gornjem popisu."
-
-#: ../../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"
+"Ukoliko nemate SCSI adapter, ISA SCSI adapter ili PCI SCSI adapter koji\n"
+"DrakX ne mo�e prepoznati, biti �ete pitani da li imate SCSI adapter u va�em\n"
+"sustavu. Ukoliko nemate adapter, mo�ete kliknuti na \"Ne\". Ukoliko kliknete "
+"na\n"
+"\"Da\", dobiti �ete popis upravlja�kih programa odakle mo�ete izabrati va�\n"
+"specifi�an adapter.\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 ""
-"Molimo izaberite pravu opciju prema va�em pisa�u.\n"
-"Molimo pogledajte njegovu dokumentaciju ako neznate �to izabrati ovdje.\n"
+"Ako trebate ru�no specifirati va� adapter, DrakX �e pitati da li �elite \n"
+"specifirati opcije za njega. Trebali biste dozvoliti DrakX-u da isproba "
+"opcije za\n"
+"hardware. Ovo obi�no radi dobro.\n"
 "\n"
 "\n"
-"Mo�i �ete testirati va�u konfiguraciju u slijede�em koraku i mo�i �ete ju "
-"promjeniti ako ne radi kako �elite."
+"Ako ne, trebati �ete navesti opcije za upravlja�ki program. Molimo "
+"pregledajte User\n"
+"Guide (poglavlje 3, sekciju \"Collective informations on your hardware\") za "
+"preporuke\n"
+"o pribavljanju ovih informacija iz dokumentacije hardware-a, sa \n"
+"proizvo�a�evog Web site-a (ukoliko imate Internet pristup) ili iz Microsoft "
+"Windows-a\n"
+"(ukoliko ga imate na va�em sustavu)."
 
-#: ../../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"
+"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"
-"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 ""
-"Sada mo�ete unijeti root lozinku za va� Linux-Mandrake sustav.\n"
-"Lozinka mora biti unijeta dva puta kako bi provjerili da su obje unijete "
-"lozinke identi�ne.\n"
-"\n"
-"\n"
-"Root je sustavski administrator i jedini je korisnik kojemu je dozvoljeno "
-"mjenjanje \n"
-"sustavske konfiguracije. Dakle, izaberite lozinku pa�ljivo. \n"
-"Neautorizirano kori�tenje root ra�una mo�e biti jako opasno za integritet\n"
-"sustava, za njegove podatke i druge sustave koji su povezani s njim.\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"
-"Lozinka bi trebala biti pomje�ana od alfanumeri�kih karaktera i mora biti\n"
-"najmanje 8 karaktera duga�ka. Nikada ne smije biti zapisana.\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"
-"Nemojte postaviti lozinku previ�e duga�ku ili kompliciranu, jer je se morate "
-"mo�i \n"
-"sjetiti bez previ�e napora."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Ako �elite dodatnu sigurnost na sustavu odaberite \"Koristi shadow datoteku"
-"\" i\n"
-"\"Koristi MD5 lozinke\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"Ukoliko va�a mre�a koristi NIS odaberite \"Koristi NIS\". Ako niste sigurni\n"
-"raspitajte se kod svog mre�nog administratora."
-
-#: ../../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"
+" * 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"
-"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=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"
-"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 ""
-"Sada mo�ete napraviri jedan ili vi�e \"regularnog\" korisni�kog ra�una, \n"
-"suprotno od \"privilegiranog\" korisni�kog ra�una, root. Mo�ete napraviti\n"
-"jedan ili vi�e ra�una za svaku osobu kojoj �elite dozvoliti kori�tenje\n"
-"ra�unala. Primjetite da �e svaki korisni�ki ra�una imati svoje vlastite\n"
-"postavke (grafi�ko okru�je, postavke programa, itd.)\n"
-"i svoj vlastiti \"ku�ni direktorij\", u kojem su te postavke\n"
-"pohranjene.\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"
-"Prije svega, napravite ra�un za sebe! Iako �ete biti samo jedan korisnik\n"
-"ra�unala, ne smijete se prijavljivati kao root za dnevno kori�tenje sustava: "
-"to je\n"
-"jako velik sigurnosni rizik. Napraviti sustav nekorisnim je obi�no samo "
-"tipku daleko.\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"
-"Dakle, trebali biste se prijaviti na sustav koriste�i korisni�ki ra�un\n"
-"i kojega ste ovdje napravili, i prijaviti se kao root samo za "
-"administriranje\n"
-"i namjene odr�avanja."
-
-#: ../../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 ""
-"Pravljenje boot diskete je visoko preporu�eno. Ako ne mo�ete\n"
-"podi�i va�e ra�unalo, to je jedini na�in za spa�avanje va�eg sustava bez\n"
-"ponovnog instaliranja."
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
+"Mo�ete dodati dodatne unose za yaboot, ili za drugi operativni sustav,\n"
+"alternativne kernele, ili za spasonosnu boot sliku.\n"
 "\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"Sada mo�ete odabrati gdje �elite\n"
-"staviti informacije potrebne za bootiranje Linuxa.\n"
+"Za druge OS-ove - unos se sastoji samo od labele i root particije.\n"
 "\n"
 "\n"
-"Ako ne znate �to odabrati odaberite \"Prvi sektor \n"
-"diska (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 ""
-"Ako niste sigurni uobi�ajeni izbor je \"/dev/hda\" (primarni \n"
-"master IDE disk) ili \"/dev/sda\" (prvi SCSI disk)."
-
-#: ../../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"
+"Za Linux, postoji nekoliko mogu�ih opcija: \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 ""
-"LILO (the LInux LOader) i Grub su bootloaderi: oni su u mogu�nosti podi�i\n"
-"ili GNU/Linux ili bilo koji drugi postoje�i operativni sustav na va�em "
-"ra�unalu.\n"
-"Normalno, ti drugi operativni sustavi su ispravno prona�eni i\n"
-"instalirani. Ako to nije slu�aj, mo�ete ga dodati ru�no na ovom\n"
-"zaslonu. Budite pa�ljivi da izaberete ispravne parametre.\n"
-"\n"
+"  - Labela: Ovo je jednostavno ime koje �ete napisati u yaboot promptu za "
+"odabir ove \n"
+"boot opcije.\n"
 "\n"
-"Tako�er �ete po�eliti ne dati pristup tim drugim operativnim sustavima\n"
-"drugima, u tom slu�aju mo�ete obrisati odgovaraju�e unose. Ali\n"
-"u tom slu�aju, trebati �ete boot disketu kako bi ih mogli podi�i!"
-
-#: ../../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"
+"  - Slika: Ovo �e biti ime kernela pri podizanju. Tipi�no vmlinux ili\n"
+"varijacija vmlinux-a sa ekstenzijom.\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"
+"  - Root: root ure�aj ili '/' za va�u Linux instalaciju.\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"
+"  - Dodatak: Na Apple hardware-u, kernel dodatak opcija se koristi vrlo "
+"�esto za\n"
+"pomo� pri inicijaliziranju video hardware-a, ili za omogu�avanje emulacije "
+"tastaturnih mi�jih gumba\n"
+"zbog �estog nedostatka 2-og ili 3-eg mi�jeg gumba na Apple mi�evima. "
+"Slijede�e \n"
+"su neki primjeri:\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 ""
-"LILO i grub glavne opcije su:\n"
-"  - Boot ure�aj: postavlja se ime ure�aja (npr. hard disk\n"
-"particija) koja sadr�i boot sektor. Ukoliko neznate specifi�no,\n"
-"izaberite \"/dev/hda\".\n"
+" \n"
+"  - Initrd: Ova opcija se mo�e koristiti ili za u�itavanje inicijalnih "
+"modula, prijenego �to je boot\n"
+"ure�aj raspolo�iv, ili za u�itavanje ramdisk slike za spasonosne boot "
+"situacije.\n"
 "\n"
 "\n"
-"  - Pauza prije podizanja podrazumijevane slike: Specifira broj destinke\n"
-"sekunde koliko �e boot loader �ekati prije podizanja prve slike.\n"
-"Ovo je korisno na sustavima na kojima se odmah podi�e sa hard diska poslije\n"
-"omogu�avanje tastature. Boot loader ne �eka ukoliko je \"pauza\" "
-"izostavljena\n"
-"ili postavljena na nulu.\n"
+"  - Initrd-veli�ina: Podrazumijevana veli�ina ramdisk-a je op�enito 4096 "
+"byte-ova. Ukoliko trebate\n"
+"alocirati ve�i ramdisk, ova opcija mo�e biti kori�tena.\n"
 "\n"
 "\n"
-"  - Video mod: ovo specifira VGA tekst mod koji �e biti odabran\n"
-"prilikom podizanja. Slijede�e vrijednosti su raspolo�ive: \n"
+"  - �itaj-Pi�i: Normalno je 'root' particija inicijalno podignuta u �itaj-"
+"samo, za mogu�nost\n"
+"provjere datote�nog sustava prije nego sustav postane '�iv'. Mo�ete "
+"nadja�ati ovu opciju ovdje.\n"
 "\n"
-"    * normalno: izabire normalan 80x25 tekst mod.\n"
 "\n"
-"    * <broj>:  koristi odgovaraju�i tekst mod.  - Obri�i \"/tmp\" prvi "
-"svakom podizanju: ukoliko �elite obrisati sve datoteke i direktorije\n"
-"spremljene u \"/tmp\" kada podi�ete va� sustav, izaberite ovu opciju.\n"
+"  - NoVideo: Ako se Apple hardware poka�e kao iznimno problemati�an, mo�ete\n"
+"izabrati ovu opciju za podizanje u 'novideo' modu, sa native framebuffer "
+"podr�kom.\n"
 "\n"
 "\n"
-"  - Precizan RAM ako je potrebno: na nesre�u, nema standardne metode za "
-"pitati \n"
-"BIOS o veli�ini RAM-a koji se nalazi u va�em ra�unalu. Kao posljedica, Linux "
-"mo�e\n"
-"pogre�no prona�i ispravnu veli�inu RAM-a. Ukoliko je to slu�aj, mo�ete\n"
-"specifirati ispravnu veli�inu RAM-a ovdje.Molimo primjetite da je razlika od "
-"2 ili 4\n"
-"MB izme�u prona�ene memorije i memorije koja se nalazi u va�em sustavu je "
-"normalna."
+"  - Podrazumijevano: Izabire ovaj unos kao podrazumijevani Linux izbor, "
+"mogu�e izbirati sa samo\n"
+"pritiskom ENTER-a na yaboot pitanju. Ovaj unos �e tako�er biti ozna�en sa "
+"'*', ukoliko\n"
+"koristite TAB za pregledavanje boot izbora."
 
-#: ../../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"
+"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"
-"Yaboot 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 ""
 "Yaboot je bootloader za NewWorld MacIntosh hardware. U mogu�nosti je\n"
 "podi�i ili GNU/Linux, MacOS, ili MacOSX, ukoliko postoje na va�em ra�unalu.\n"
@@ -3607,346 +3391,79 @@ msgstr ""
 "kada Open Firmware \n"
 "pauza istekne."
 
-#: ../../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 ""
-"Mo�ete dodati dodatne unose za yaboot, ili za drugi operativni sustav,\n"
-"alternativne kernele, ili za spasonosnu boot sliku.\n"
-"\n"
-"\n"
-"Za druge OS-ove - unos se sastoji samo od labele i root particije.\n"
-"\n"
-"\n"
-"Za Linux, postoji nekoliko mogu�ih opcija: \n"
-"\n"
-"\n"
-"  - Labela: Ovo je jednostavno ime koje �ete napisati u yaboot promptu za "
-"odabir ove \n"
-"boot opcije.\n"
-"\n"
-"\n"
-"  - Slika: Ovo �e biti ime kernela pri podizanju. Tipi�no vmlinux ili\n"
-"varijacija vmlinux-a sa ekstenzijom.\n"
-"\n"
-"\n"
-"  - Root: root ure�aj ili '/' za va�u Linux instalaciju.\n"
-"\n"
-"\n"
-"  \n"
-"  - Dodatak: Na Apple hardware-u, kernel dodatak opcija se koristi vrlo "
-"�esto za\n"
-"pomo� pri inicijaliziranju video hardware-a, ili za omogu�avanje emulacije "
-"tastaturnih mi�jih gumba\n"
-"zbog �estog nedostatka 2-og ili 3-eg mi�jeg gumba na Apple mi�evima. "
-"Slijede�e \n"
-"su neki primjeri:\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: Ova opcija se mo�e koristiti ili za u�itavanje inicijalnih "
-"modula, prijenego �to je boot\n"
-"ure�aj raspolo�iv, ili za u�itavanje ramdisk slike za spasonosne boot "
-"situacije.\n"
-"\n"
-"\n"
-"  - Initrd-veli�ina: Podrazumijevana veli�ina ramdisk-a je op�enito 4096 "
-"byte-ova. Ukoliko trebate\n"
-"alocirati ve�i ramdisk, ova opcija mo�e biti kori�tena.\n"
-"\n"
-"\n"
-"  - �itaj-Pi�i: Normalno je 'root' particija inicijalno podignuta u �itaj-"
-"samo, za mogu�nost\n"
-"provjere datote�nog sustava prije nego sustav postane '�iv'. Mo�ete "
-"nadja�ati ovu opciju ovdje.\n"
-"\n"
-"\n"
-"  - NoVideo: Ako se Apple hardware poka�e kao iznimno problemati�an, mo�ete\n"
-"izabrati ovu opciju za podizanje u 'novideo' modu, sa native framebuffer "
-"podr�kom.\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"
-"  - Podrazumijevano: Izabire ovaj unos kao podrazumijevani Linux izbor, "
-"mogu�e izbirati sa samo\n"
-"pritiskom ENTER-a na yaboot pitanju. Ovaj unos �e tako�er biti ozna�en sa "
-"'*', ukoliko\n"
-"koristite TAB za pregledavanje boot izbora."
-
-#: ../../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"
+" * \"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"
-"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 ""
-"SILO je bootloader za SPARC: on je u mogu�nosti podignuti\n"
-"ili GNU/Linux ili bilo koji drugi postoje�i operativni sustav na va�em "
-"ra�unalu.\n"
-"Normalno, ti drugi operativni sustavi su ispravno detektirani i\n"
-"instalirani. Ukoliko to nije slu�aj, mo�ete dodati unos ru�no na ovom\n"
-"zaslonu. Budite pa�ljivi da izaberete ispravne parametre.\n"
-"\n"
-"\n"
-"Tako�er �ete mo�da po�eljeti nedati pristup tim drugim operativnim "
-"sustavima\n"
-"nikome, u tom slu�aju mo�ete obrisati odgovaraju�e unose. Ali\n"
-"u tom slu�aju, trebati �ete boot disketu da bi ih podigli!"
 
-#: ../../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 ""
-"SILO glavne opcije su:\n"
-"  - Bootloader instalacija: Ozna�ava gdje �elite postaviti\n"
-"zahtjevane informacije za podizanje GNU/Linux-a. Ukoliko ne znate to�no\n"
-"�to radite, izaberite \"Prvi sektor diska (MBR)\".\n"
-"\n"
-"\n"
-"  - Pauza prije bootiranja podrazumijevane slike: Specifira broj u "
-"desetinkama\n"
-"sekunde koliko �e boot loader �ekati prije nego podigne prvu sliku.\n"
-"Ovo je korisno na sustavima na kojima se sustav podi�e odmah sa hard diska "
-"poslije\n"
-"omogu�ivanja tastature. Boot loader ne �eka ukoliko je \"pauza\"\n"
-"izostavljena ili postavljena na nulu."
+"Izaberite hard disk kojeg �elite obrisati kako bi instalirali va�u\n"
+"novu Mandrake Linux particiju. Budite pa�ljivi, svi postoje�i podaci biti �e "
+"izgubljeni\n"
+"i ne�e se mo�i povratiti."
 
-#: ../../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"
-"\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"
-"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 ""
-"Sada je vrijeme za konfiguriranje X Window Sustava, �to je\n"
-"jezgra GNU/Linux GUI-a (Grafi�kog Korisni�kog Su�elja). Za ovu namjenu,\n"
-"morate konfigurirati va�u video karticu i monitor. Ve�ina tih\n"
-"koraka je automatizirano, dakle, va� rad se mo�e sastojati\n"
-"od samog provjeravanja �to je ura�eno i prihva�anja postavki :)\n"
+"Izaberite \"U redu\" ukoliko �elite obrisati sve podatke i\n"
+"postoje�e particije na navedenom hard disku. Budite pa�ljivi, nakon "
+"klikanja\n"
+"na \"U redu\", ne�ete mo�i povratiti bilo kakve postoje�e podatke ili "
+"particije\n"
+"na ovom hard disku, uklju�uju�i Windows podatke.\n"
 "\n"
 "\n"
-"Kada je konfiguracija zavr�ena, X-i �e biti pokrenuti (ako DrakX-u\n"
-"niste rekli suprotno) tako da mo�ete provjeriti i vidjeti da li\n"
-"vam postavke odgovaraju. Ukoliko ne, mo�ete do�i kasnije i\n"
-"promjeniti ih, koliko god puta je potrebno."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"Ukoliko je X pogre�no pode�en kori�tenjem ovih opcija mo�ete\n"
-"ispravno podesiti X Window sustav."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Ukoliko preferirate grafi�ku prijavu odaberite \"Da\". U protivnom, "
-"odaberite \"Ne\"."
-
-#: ../../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 ""
-"Mo�ete izabrati sigurnosnu razinu za va� sustav. Molimo pogledajte upute za "
-"kompletnu\n"
-"  informaciju. Jednostavno, ako ne znate �to izabrati, zadr�ite postavljenu "
-"opciju.\n"
+"Pritisnite na \"Odustani\" za prekidanje ove operacije bez gubljenja bilo\n"
+"kakvih postoje�ih podataka i particija na ovom hard disku."
 
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"Va� sustav �e sada rebootirati.\n"
-"\n"
-"Nakon reboot-a va� novi Linux Mandrake sustav �e se automatski u�itati.\n"
-"Ukoliko �elite bootirati neki drugi postoje�i operativni sustav molim "
-"pro�itajte\n"
-"dodatne upute."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Odaberite jezik"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Odaberite razred instalacije"
 
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Otkrivanje hard diskova"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Podesi mi�"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Odaberite tipkovnicu"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Sigurnost"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Podesi datote�ne sustave"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formatiraj particije"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Izabir instaliranih paketa"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Instaliraj sustav"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Pode�avanje root lozinke"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Dodaj korisnika"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Podesi mre�u"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Sumarno"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Pode�avanje servisa"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Napravi boot disketu"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Instaliraj bootloader"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Podesi X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Izlaz iz instalacije"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3972,20 +3489,20 @@ msgstr ""
 "\n"
 "Da li zaista �elite instalirati te poslu�itelje?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Ne mogu koristiti broadcast bez NIS domene"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Umetnite FAT formatiranu disketu u pogon %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "Ova disketa nije FAT formatirana"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3993,30 +3510,20 @@ msgstr ""
 "Za kori�tenje spremljenog odabira paketa, podignite instalaciju sa ``linux "
 "defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Gre�ka prilikom �itanja datoteke $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Gre�ka prilikom �itanja datoteke %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 "U redu"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Molimo istestirajte mi�a."
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Za aktiviranje mi�a,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "POMAKNITE VA� KOTA�I�!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -4026,7 +3533,7 @@ msgstr ""
 "Neki hardware na va�em ra�unalu treba ``vlasni�ke'' upravlja�ke programe\n"
 "kako bi proradio. Mo�ete na�i vi�e informaciju o tome na: %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"
@@ -4036,11 +3543,11 @@ msgstr ""
 "Prvo napravite particiju (ili kliknite na postoje�u) te\n"
 "odaberite akciju ``Mjesto monitranja'' te odaberite `/'"
 
-#: ../../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 "Morate imati swap particiju"
 
-#: ../../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"
@@ -4050,55 +3557,59 @@ msgstr ""
 "\n"
 "Da ipak nastavim?"
 
-#: ../../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 "Morate imati FAT particiju montiranu na /boot/efi"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Koristi slobodan prostor"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Nema dovoljno slobodnog prostora za pravljenje novih particija"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Koristi postoje�e particije"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Nema postoje�ih particija koje bih mogao upotrijebiti"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Koristi Windows particiju za loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Koju particiju �elite koristiti za Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Odaberite veli�inu"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Veli�ina korijenske particije u MB: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Veli�ina swap particiju u MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Iskoristi slobodan prostor na Windows particiji"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Kojoj particiji �elite promijeniti veli�inu?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Izra�unavam granice Windows datote�nog sustava"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4107,12 +3618,12 @@ msgstr ""
 "Program koji mjenja veli�inu FAT-a ne mo�e rukovati va�om particijom, \n"
 "slijede�a gre�ka se dogodila: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Va�a Windows particija je prefragmentirana, molim pokrenite ``defrag'' prvo."
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4132,21 +3643,21 @@ msgstr ""
 "Windows particije.\n"
 "Kada ste sigurni da �elite nastaviti, pritisnite U redu."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Koliku veli�inu �elite zadr�ati za windowse"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "particija %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Mijenjanje FAT veli�ine nije uspjelo: %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)"
@@ -4154,32 +3665,32 @@ msgstr ""
 "Nema FAT particije za mjenjanje veli�ine ili za kori�tenje loopback-a (ili "
 "nema dovoljno prostora)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Obri�i cijeli disk"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Ukloni Windowse(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 "Imate vi�e od jednog hard diska, na koji �elite instalirati 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 "SVE postoje�e particije i podaci biti �e izgubljeni na disku %s"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Proizvoljno particioniranje diska"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Koristi fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4188,28 +3699,28 @@ msgstr ""
 "Sada mo�ete razdijeliti %s.\n"
 "Kada ste gotovi ne zaboravite spremiti postavu sa `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Nemate dovoljno slobodnog prostora na va�oj Windows particiji"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "Ne mogu prona�i bilo kakvo mjesto za instaliranje"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX �arobnjak za particioniranje je prona�ao slijede�a rje�enja:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Particioniranje neuspjelo: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Podi�em mre�u"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Onemogu�ujem mre�u"
 
@@ -4221,12 +3732,12 @@ msgstr ""
 "Dogodila se gre�ka, ali neznam kako s njom lijepo rukovati.\n"
 "Nastavite dalje na vlastiti rizik."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Dupliciraj mjesto monitranja %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"
@@ -4238,16 +3749,16 @@ msgstr ""
 "Provjerite cdrom na instaliranom ra�unalu koriste�i \"rpm -qpl Mandrake/RPMS/"
 "*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Dobrodo�li u %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Disketni pogon nije dostupan"
 
-#: ../../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"
@@ -4261,32 +3772,32 @@ msgstr "Izaberite veli�inu koji �elite instalirati"
 msgid "Total size: "
 msgstr "Ukupna veli�ina:"
 
-#: ../../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 "Ina�ica: %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 "Veli�ina: %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 "Odaberite pakete koje �elite instalirati"
 
-#: ../../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 "Instaliraj"
 
-#: ../../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 "Instaliram"
 
@@ -4294,7 +3805,7 @@ msgstr "Instaliram"
 msgid "Please wait, "
 msgstr "Molim pri�ekajte, "
 
-#: ../../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 "Preostalo vrijeme"
 
@@ -4303,21 +3814,21 @@ msgid "Total time "
 msgstr "Ukupno vrijeme"
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Pripremam instalaciju"
 
-#: ../../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 "Instaliram paket %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 "Da ipak nastavim?"
 
-#: ../../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 "Javila se gre�ka prilikom sortiranja paketa:"
 
@@ -4325,28 +3836,32 @@ msgstr "Javila se gre�ka prilikom sortiranja paketa:"
 msgid "Use existing configuration for X11?"
 msgstr "Da koristim postoje�u postavu 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 ""
 "Va� sustav je slab na resursima. Mo�ete imati nekih problem prilikom\n"
-"instalacije Linux-Mandrake-a. Ukoliko se to desi, mo�ete probati tekstualnu\n"
+"instalacije Mandrake Linux-a. Ukoliko se to desi, mo�ete probati tekstualnu\n"
 "instalaciju. Za to, pritisnite `F1' kada podi�ete CDROM, i unesite `text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Instalacijski razred"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Molim izaberite jedan od slijede�ih razreda instalacije:"
 
-#: ../../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 "Ukupna veli�ina izabranih grupa je otprilike %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"
@@ -4361,7 +3876,7 @@ msgstr ""
 "Mali postotak �e instalirati samo najva�nije pakete;\n"
 "dok postotak od 100%% �e instalirati sve odabrane pakete."
 
-#: ../../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"
@@ -4378,85 +3893,69 @@ msgstr ""
 "Mali postotak �e instalirati samo najva�nije pakete;\n"
 "dok postotak od %d%% �e instalirati koliko god je paketa mogu�e."
 
-#: ../../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 "Detaljniji izbor nalazi se u slijede�em koraku."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Odaberite postotak paketa koje �elite instalirati"
 
-#: ../../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 "Odabir grupe paketa"
 
-#: ../../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 "Individualan odabir paketa"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "Prika�i automatski odabrane pakete"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Pro�iri stablo"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Sa�mi stablo"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Prebaci izme�u ravno i grupno sortiranog"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Ukupna veli�ina: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Lo� paket"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Ime: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Zna�aj: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Ukupna veli�ina: %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 ""
 "Ne mo�ete ozna�iti ovaj paket budu�i da nema dovoljno mjesta gdje ga se mo�e "
 "instalirati"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Slijede�i paketi �e biti instalirani"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Slijede�i paketi �e biti uklonjeni"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Ne mo�ete ozna�iti/odzna�iti ovaj paket"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Budu�i da je ovo obvezni paket ne mo�ete ga odzna�iti"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "Ne mo�ete odzna�iti ovaj paket budu�i da je ve� instaliran"
 
-#: ../../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?"
@@ -4464,24 +3963,41 @@ msgstr ""
 "Ovaj paket treba nadograditi\n"
 "Da li ste sigurni da ga �elite odzna�iti?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Ne mo�ete odzna�iti ovaj paket budu�i da ga treba nadograditi"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Prika�i automatski odabrane pakete"
+
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "U�itaj/Spremi na disketu"
+
+#: ../../install_steps_gtk.pm_.c:461
+msgid "Updating package selection"
+msgstr "Dogra�ujem izbor paketa"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "Deinstaliraj"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Procjenjujem"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Molimo pri�ekajte, Pripremam instalaciju"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d paketa"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4542,15 +4058,15 @@ msgstr ""
 "uva�enim autorima i za�ti�eni su intelektualnim vlasni�tvom i \n"
 "autorskim zakonima primjenjivim na software-ske programe.\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 "Prihvati"
 
-#: ../../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 "Odbij"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4566,7 +4082,7 @@ msgstr ""
 "Ukoliko ga nemate, pritisnite Odustani kako bi izbjegli instalaciju sa ovog "
 "Cd-Rom-a."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Pojavila se gre�ka kod instalacije paketa:"
 
@@ -4574,34 +4090,21 @@ msgstr "Pojavila se gre�ka kod instalacije paketa:"
 msgid "An error occurred"
 msgstr "Pojavila se gre�ka"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Molim izaberite jezik koji �elite koristiti."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "Mo�ete izabrati druge jezike koji �e biti dostupni nakon instalacije"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Sve"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Licencni dogovor"
 
-#: ../../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"
@@ -4655,7 +4158,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"
@@ -4692,7 +4195,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"
@@ -4713,13 +4216,13 @@ msgid ""
 msgstr ""
 "Uvod\n"
 "\n"
-"Operativni sustav i njegove razli�ite komponente raspolo�ive u Linux-"
-"Mandrake distribuciji \n"
+"Operativni sustav i njegove razli�ite komponente raspolo�ive u Mandrake "
+"Linux distribuciji \n"
 "�e se zvati \"Software-ski Produkti\" daljnje u tekstu. Software-ski "
 "Produkti  uklju�uju, ali nisu \n"
 "ograni�eni na, skup programa, metoda, zakona i dokumentacija vezanih uz "
 "operativni\n"
-"sustav i razli�ite komponente Linux-Mandrake distribucije.\n"
+"sustav i razli�ite komponente Mandrake Linux distribucije.\n"
 "\n"
 "\n"
 "1. Licencni Dogovor\n"
@@ -4771,7 +4274,7 @@ msgstr ""
 "posljedicagubitka) �to je posljedica \n"
 "posjedovanja ili kori�tenja software-skih komponenti ili kao posljedica "
 "skidanja (download-a) software-skih komponenti \n"
-"sa jednog od Linux-Mandrake site-ova koja su zabranjena ili ograni�ena u "
+"sa jednog od Mandrake Linux site-ova koja su zabranjena ili ograni�ena u "
 "nekim zemljama po lokalnim zakonima.\n"
 "Ova ograni�ena odgovornost se primjenjuje na, ali nije ograni�ena, jake "
 "kriptografske komponente \n"
@@ -4807,7 +4310,7 @@ msgstr ""
 "MandrakeSoft S.A. zadr�ava svoje pravo za izmjenu ili prilago�avanje "
 "Software-skog Produkta, kao cijelinu ili u\n"
 "dijelovima, u svim slu�ajevima za sve namjene.\n"
-"\"Mandrake\", \"Linux-Mandrake\" i pripadaju�i logoi su za�ti�eni prodajni "
+"\"Mandrake\", \"Mandrake Linux\" i pripadaju�i logoi su za�ti�eni prodajni "
 "znaci MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4825,103 +4328,99 @@ msgstr ""
 "Za bilo kakva pitanja o ovom dokumentu, molimo kontaktirajte 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 "Tipkovnica"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Molim izaberite raspored tipkovnice."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "Ovdje je cijeli popis raspolo�ivih tipkovnica"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Instalacijski razred"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Koji instalacijski razred �elite?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Instaliraj/Nadogradi"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Da li je ovo instalacija ili nadogradnja?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Preporu�eno"
 
-#: ../../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 "Dogradnja"
 
-#: ../../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 "Molim izaberite koju vrstu mi�a koristite."
 
-#: ../../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 mi�a"
 
-#: ../../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 "Izaberite na kojem serijskom portu je mi� priklju�en."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "Emulacija gumbova"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "Emulacija 2 gumba"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "Emulacija 3 gumba"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Pode�avam PCMCIA kartice..."
 
-#: ../../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 "Pode�avam 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 "nema dostupnih particija"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Tra�im particije kako bi prona�ao mjesta montiranja"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Odaberite mjesta montiranja"
 
-#: ../../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"
@@ -4939,7 +4438,7 @@ msgstr ""
 "\n"
 "Da li se sla�ete da izgubite sve particije?\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!"
@@ -4947,80 +4446,121 @@ msgstr ""
 "DiskDrake nije uspio pro�itati va�u particijsku tablice.\n"
 "Nastavite o vlastitoj odgovornosti."
 
-#: ../../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 ""
+"Nema slobodnog mjesta za 1 MB bootstrap! Instalacija �e nastaviti, ali za "
+"podizanje va�eg sustava, trebati �ete napraviti bootstrap particiju u "
+"DiskDrake-u"
+
+#: ../../install_steps_interactive.pm_.c:349
+msgid "No root partition found to perform an upgrade"
+msgstr "Niti jedna root particija nije prona�ena da se obavi dogradnja"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Korijenska particija"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Koja je korijenska particija  (/) va�eg sustava?"
 
-#: ../../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 ""
 "Morate ponovo pokrenuti sustav kako bi se aktivirala promjena particijske "
 "tablice"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Izaberite particije koje �elite formatirati"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Provjeri za lo�e blokove?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Formatiram particije"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Stvaram i formatiram datoteku %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Nema dovoljno swapa za zavr�etak instalacije, molim dodajte jo�"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Tra�im dostupne pakete"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Tra�im pakete koje mogu nadograditi"
 
-#: ../../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 ""
 "Va� sustav nema dovoljno prostora za instalaciju ili dogradnju (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Kompletno (%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 "Preporu�eno (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Prilago�eno"
 
-#: ../../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 ""
+"Molimo izaberite u�itivanje ili spremanje izbora paketa na disketu.\n"
+"Format je isto kao auto_install napravljene diskete."
+
+#: ../../install_steps_interactive.pm_.c:525
+msgid "Load from floppy"
+msgstr "U�itaj sa diskete"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "U�itavam sa diskete"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "Odabir paketa"
+
+#: ../../install_steps_interactive.pm_.c:532
+msgid "Insert a floppy containing package selection"
+msgstr "Umetnite disketu koja sadr�ava izbor paketa"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Spremi na disketu"
+
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Selected size is larger than available space"
 msgstr "Izabrana veli�ina je ve�a nego raspolo�iv prostor"
 
-#: ../../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"
@@ -5031,12 +4571,12 @@ msgstr ""
 "Ako imate samo neke od dolje navedenih CDa odzna�ite one koje nemate i "
 "kliknite U redu."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom naslovljen \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5045,11 +4585,21 @@ msgstr ""
 "Instaliram paket %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Postava nakon instalacije"
 
-#: ../../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 "Umetnite disketu u pogon %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Umetnite praznu disketu u pogon %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -5120,94 +4670,134 @@ 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 "Izaberite mirror sa kojeg �elite skinuti pakete"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Spajam se na mirror kako bih pribavio popis dostupnih paketa"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Odaberite pakete za instalaciju."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Koja je va�a vremenska zona?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "Da li je va� hardverski sat namje�ten na GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+msgid "Hardware clock set to GMT"
+msgstr "Va� hardverski sat namje�ten je na GMT"
+
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr "Automatska vremenska sinkronizacija (koriste�i NTP)"
+
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "NTP Poslu�itelj"
 
-#: ../../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 "Udaljeni CUPS poslu�itelj"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Nema pisa�a"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Sumarno"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Mi�"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../../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 "Pisa�"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "ISDN kartica"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Zvu�na kartica"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "TV kartica"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Koji ispisni sustav �elite koristiti?"
+#: ../../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 "Lokalne datoteke"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Pode�avanje root lozinke"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Bez lozinke"
 
-#: ../../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 ""
 "Ova lozinka je prejednostavna (lozinka mora sadr�avati barem %d znakova)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Koristi NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Provjera autenti�nosti"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "�ute stranice"
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "LDAP Autentifikacija"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
-msgstr "Provjera autenti�nosti NIS"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr "LDAP Base dn"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:951
+msgid "LDAP Server"
+msgstr "LDAP Poslu�itelj"
+
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
+msgstr "NIS Autentifikacija"
+
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS domena"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "NIS Poslu�itelj"
 
-#: ../../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 "
@@ -5238,19 +4828,19 @@ msgstr ""
 "Ako �elite napraviti boot disketu za va� sustav, ubacite disketu u prvi\n"
 " pogon i pritisnite \"U redu\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Prvi disketni pogon"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Drugi disketni pogon"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Presko�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 "
@@ -5274,32 +4864,44 @@ msgstr ""
 " sustavskih gre�aka.\n"
 "Da li �elite napraviti proizvoljnu boot disketu za va� sustav?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "�alim, me�utim disketni pogon nije dostupan"
 
-#: ../../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 "Izaberite disketni pogon koji �elite koristiti za izradu boot diskete"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Umetnite disketu u pogon %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Stvaram boot disketu"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Pripremam bootloader"
 
-#: ../../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 ""
+"�ini se da imate OldWorld ili Nepoznato\n"
+" ra�unalo, yaboot bootloader ne�e mo�i raditi kod vas.\n"
+"Instalacija �e nastaviti, ali �ete morati\n"
+" koristiti BootX da podignete va�e ra�unalo"
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "Da li �elite koristiti 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?"
@@ -5307,17 +4909,23 @@ msgstr ""
 "Gre�ka prilikom instalacije aboot-a, \n"
 "probati nasilno instalirati iako to mo�e uni�titi prvu particiju?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Instaliraj bootloader"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 "Instalacija bootloader-a nije uspjela. Prijavljena je slijede�a gre�ska:"
 
-#: ../../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 ""
@@ -5328,38 +4936,34 @@ msgstr ""
 " Tada napi�ite: shut-down\n"
 "Pri slijede�em podizanju trebali biste vidjeti prompt bootloader-a."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Nizak"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Srednji"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Visok"
 
-#: ../../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 "Izaberite sigurnosni nivo"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"Da li �elite generirati auto instalacijsku disketu za replikaciju linux-a?"
-
-#: ../../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 "Umetnite praznu disketu u pogon %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 "Pravim auto instalacijsku disketu"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5367,35 +4971,35 @@ msgid ""
 msgstr ""
 "Niste zavr�ili sve korake.\n"
 "\n"
-"�elite li zbilja zavr�iti?"
+"�elite li zaista zavr�iti?"
 
-#: ../../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 ""
 "�estitam, instalacija je kompletna.\n"
 "Uklonite boot medij i pritisnite return za ponovno podizanje.\n"
 "\n"
-"Za informacije o popravcima koji su raspolo�ivi za ovo izdanje Linux-"
-"Mandrake-a,\n"
-"konzultirajte Eratu raspolo�ivu na http://www.linux-mandrake.com/.\n"
+"Za informacije o popravcima koji su raspolo�ivi za ovo izdanje Mandrake "
+"Linux-a,\n"
+"konzultirajte Eratu raspolo�ivu na http://www.mandrakelinux.com/.\n"
 "\n"
 "Informacije o konfiguriranju va�eg sustava je raspolo�ivo u poslije\n"
-"instalacijskom poglavlju od Official Linux-Mandrake User's Guide."
+"instalacijskom poglavlju od Official Mandrake Linux User's Guide."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Napravi auto instalacijsku disketu"
 
-#: ../../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"
@@ -5409,41 +5013,58 @@ msgstr ""
 "\n"
 "Mo�ete preferirati da ponovite instalaciju.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automatski"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Ponovno prika�i"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Spremi odabir paketa"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake instalacija %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux instalacija %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> izme�u elemenata  | <Space> bira | <F12> slijede�i zaslon"
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "kdesu nedostaje"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Izaberite akciju"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Napredno"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Molim pri�ekajte"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Pro�iri stablo"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Sa�mi stablo"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Prebaci izme�u ravno i grupno sortiranog"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5469,267 +5090,288 @@ msgstr "Va� izbor? (uobi�ajeno %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Va� izbor? (uobi�ajeno %s unesite `none' za nijedan)"
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "�e�ka (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 "Njema�ka"
 
-#: ../../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 "�panjolska"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Finska"
 
-#: ../../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 "Francuska"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norve�ka"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Poljska"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Ruska"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "�vedska"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "UK tipkovnica"
 
-#: ../../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 tipkovnica"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "Albanska"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armenska (stara)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armenska (pisa�a ma�ina)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Armenska (fonetska)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbejd�anska (latinica)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbejd�anska (�irilica)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belgijska"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bugarska"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazilska (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Bjeloruska"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "�vicarska (Njema�ki raspored)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "�vicarska (francuski raspored)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "�e�ka (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "�e�ka (Programerska)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Njema�ka (bez mrtvih tipaka)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Danska"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak (USA)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak (Norve�ka)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estonska"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruzijska  (\"Ruski\" raspored)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruzijska  (\"Latin\" raspored)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Gr�ka"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Ma�arska"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Hrvatska"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Izraelska"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Izraelska (fonetska)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iranska"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Islandska"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Talijanska"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japanska (106 tipaka)"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Korejska tipkovnica"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latino ameri�ka"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Makedonska"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Nizozemska"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituanska AZERTY (stara)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituanska AZERTY (nova)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituanska \"number row\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituanska \"fonetska\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Lokacija"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Makedonska"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Nizozemska"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Poljska (qwerty raspored)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Poljska (qwertz raspored)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugalska"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanadska (Quebec)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "Rumunjska (qwertz)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "Rumunjska (qwerty)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "Ruska (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "�vedska"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Slovenska"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slova�ka (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slova�ka (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Slova�ka (Programerska)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbejd�anska (�irilica)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Tajlandska tipkovnica"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Tajlandska tipkovnica"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turska (tradicionalni \"F\" model)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turska (moderna  \"Q\" model)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukrajinska"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "US keyboard (internacionalna)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vijetnamska \"numeric row\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Jugoslavenska (latini�no/�irili�no)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Kru�no montiranje %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Ukloni logi�ki volumen prvo\n"
 
@@ -5841,170 +5483,231 @@ msgstr "niti jedan"
 msgid "No mouse"
 msgstr "Nema mi�a"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Molimo istestirajte mi�a."
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Za aktiviranje mi�a,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "POMAKNITE VA� KOTA�I�!"
+
+#: ../../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 "Zavr�i"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Slijede�e ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Prija�nje"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Da li je ovo ispravno?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Postava Interneta"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Spoji se na Internet"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Da li �elite poku�ati spajanje na Internet ?"
+#: ../../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 ""
+"Naj�e��i na�in da se pove�ete sa adsl-om je pppoe.\n"
+"Neke veze koriste pptp, a nekoliko koriste dhcp.\n"
+"Ukoliko neznate, izaberite 'koristi pppoe'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Testiram va�u vezu..."
+#: ../../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 "Sustav je sada spojen na Internet."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "koristi dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Zbog sigurnosnih razloga, biti �e sada odspojen."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "koristi pppoe"
+
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "koristi 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 ""
-"�ini se kako sustav nije spojen na internet.\n"
-"Probajte ponovno podesiti va�u vezu."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Mre�ne postavke"
-
-#: ../../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 postavke"
+"Koji dhcp klijent �elite koristiti?\n"
+"Pretpostavljeni je 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 ""
-"Izaberite va�eg pru�atelja Internet usluga.\n"
-" Ako nije na popisu odaberite Drugi"
+"Nije prona�en niti jedan mre�ni adapter na va�em sustavu.\n"
+"Ne mogu postaviti ovu vrstu veze."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Postava Veze"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Odaberite mre�ni me�usklop"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Molim ispunite ili provjerite vrijednost doljnjeg polja"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Molimo izaberite sa kojim mre�nim adapterom se �elite priklju�iti na Internet"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ kartice"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "ne mogu prona�i niti jednu mre�nu karticu"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Memorija kartice (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Pode�avam mre�u"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "IO kartice"
+#: ../../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 ""
+"Molim unesite ime ra�unala ukoliko ga znate.\n"
+"Neki DHCP serveri zahtjevaju specifiranje imena ra�unala da bi radili.\n"
+"Va�e ime ra�unala bi trebalo biti potpuno-kvalificirano ime ra�unala,\n"
+"kao �to je ``mybox.mylab.myco.com''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "IO_0 kartice"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Ime ra�unala"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "IO_1 kartice"
+#: ../../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 "�arobnjak mre�nih postavki"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Va� osobni telefonski broj"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Vanjski ISDN modem"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Ime ISP pru�atelja (npr. provider.hr)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Interna ISDN kartica"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Telef. broj pru�atelja"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Kakav tip ISDN veze koristite ?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Pru�ateljev DNS 1"
+#: ../../network/isdn.pm_.c:45
+#, fuzzy
+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 ""
+"Koju ISDN konfiguraciju preferirate?\n"
+"\n"
+"* Potpuna konfiguracija koristi isdn4net. Ona sadr�ava sna�ne alate, ali je "
+"te�a po�etnicima za konfiguriranje, i nije standardna.\n"
+"\n"
+"* Laka konfiguracija je lak�a za razumjeti, standardnija, ali sa manje "
+"alata.\n"
+"\n"
+"Preporu�amo laku konfiguraciju.\n"
+"\n"
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "Pru�ateljev DNS 2"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "Potpuna konfiguracija (isdn4net)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Na�in biranja"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "Potpuna konfiguracija (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Korisni�ko ime"
+#: ../../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 postavke"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Korisni�ka Lozinka"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Izaberite va�eg pru�atelja Internet usluga.\n"
+" Ako nije na popisu odaberite Drugi"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Boot protokol"
 
-#: ../../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 "Ostatak svijeta"
 
-#: ../../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 ""
 "Ostatak svijeta \n"
 " bez D-kanala (za iznajmljene linije)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Koji protokol �elite koristiti ?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Kakvu karticu posjedujete?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Ne znam"
 
-#: ../../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"
@@ -6017,19 +5720,19 @@ msgstr ""
 "\n"
 "Ukoliko imate PCMCIA karticu, morate znati irq i io va�e kartice.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Prekini"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Nastavi"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Kakvu ISDN karticu imate?"
 
-#: ../../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."
@@ -6037,111 +5740,61 @@ msgstr ""
 "Prona�ao sam ISDN PCI karticu me�utim ne znam kojeg je tipa. Molim izaberite "
 "va�u PCI karticu na slijede�em ekranu."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "Nisam na�ao niti jednu ISDN PCI karticu. Molim izaberite va�u PCI karticu na "
 "slijede�em ekranu."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Nije prona�en niti jedan mre�ni adapter na va�em sustavu.\n"
-"Ne mogu postaviti ovu vrstu veze."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Odaberite mre�ni me�usklop"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Molimo izaberite sa kojim mre�nim adapterom se �elite priklju�iti na Internet"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Mre�ni me�usklop"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Da li se sla�ete?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Poku�avam ponovno pokrenuti mre�ni ure�aj:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ADSL postavke"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Da li �elite pokreniti va�u vezu kod svakog podizanja (boot) sustava ?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Izaberite serijski port na kojemu se nalazi modem."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Podesi dialup"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Ime veze"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Telefonski broj"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Prijavno ime"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Provjera autenti�nosti"
+#: ../../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 "Temeljem skripta"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Terminal-zasnovano"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Ime domene"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Prvi DNS poslu�itelj (opciono)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Drugi DNS poslu�itelj (opciono)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"Poku�avam ponovno pokrenuti mre�ni ure�aj $netc->{NET_DEVICE}. Da li se "
-"sla�ete?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6149,7 +5802,7 @@ msgstr ""
 "\n"
 "Mo�ete isklju�iti ili ponovno konfigurirati va�u vezu."
 
-#: ../../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."
@@ -6157,11 +5810,11 @@ msgstr ""
 "\n"
 "Mo�ete ponovno konfigurirati va�u vezu."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Trenutno ste spojeni na internet."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -6169,102 +5822,53 @@ msgstr ""
 "\n"
 "Mo�ete se spojiti na Internet ili ponovno konfigurirati va�u vezu."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Niste trenutno spojeni na Internet."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Spoji se na Internet"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Prekini vezu na Internet"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Postavke mre�nih veza (LAN ili Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Internet veza i postava"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "�arobnjak mre�nih postavki"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Vanjski ISDN modem"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Interna ISDN kartica"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Kakav tip ISDN veze koristite ?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Spoji se na 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 ""
-"Naj�e��i na�in da se pove�ete sa adsl-om je pppoe.\n"
-"Neke veze koriste pptp, a nekoliko koriste dhcp.\n"
-"Ukoliko neznate, izaberite 'koristi pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "koristi dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "koristi pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "koristi pptp"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "Poku�avam ponovno pokrenuti mre�ni ure�aj %s. Da li se sla�ete?"
-
-#: ../../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 ""
-"Koji dhcp klijent �elite koristiti?\n"
-"Pretpostavljeni je dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "Mre�ne postavke"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Da li �elite ponovno pokrenuti mre�u?"
+"\n"
+"Mo�ete isklju�iti ili ponovno konfigurirati va�u vezu."
 
-#: ../../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 ""
-"Problem se pojavio prilikom ponovnog pokretanja mre�e: \n"
 "\n"
-"%s"
+"Mo�ete isklju�iti ili ponovno konfigurirati va�u vezu."
+
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Mre�ne postavke"
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6275,7 +5879,7 @@ msgstr ""
 "Pritisnite U redu da zadr�ite postoje�e postavke, ili Odustani za ponovno "
 "konfiguriranje va�e mre�ne/Internet veze.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6288,72 +5892,113 @@ msgstr ""
 "Ukoliko ne �elite koristiti auto detekciju, odselektirajte kvadrati� s "
 "potvrdom.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Izaberite profil za konfiguriranje"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Koristi auto detekciju"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Otkrivanje ure�aja..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Normalna modemska veza"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "detektiran na portu %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "ISDN veza"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "detektirano %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (ili ADSL) veza"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "LAN veza"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "detektirano na me�usklopu %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Kablovska veza"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "detektirana kablovska veza"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "LAN veza"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "ethernet kartica(e) prona�ene"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Kako se �elite spojiti na Internet?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "Izaberite alat koje �elite koristiti"
 
-#: ../../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 ""
+
+#: ../../network/netconnect.pm_.c:215
+#, fuzzy
+msgid "Internet connection"
+msgstr "Dijeljenje Internet Veze"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Da li �elite pokreniti va�u vezu kod svakog podizanja (boot) sustava ?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Mre�ne postavke"
+
+#: ../../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 ""
+"Problem se pojavio prilikom ponovnog pokretanja mre�e: \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 ""
 "�estitam, mre�na i internet konfiguracija je zavr�ena.\n"
 "\n"
-"Konfiguracija �e sada biti primjenjena na va�em sustavu."
+"Konfiguracija �e sada biti primjenjena na va�em sustavu.\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."
@@ -6361,31 +6006,7 @@ msgstr ""
 "Nakon �to je to napravljeno, preporu�amo da ponovno pokrenete va�e X\n"
 "okru�je kako bi izbjegli probleme prilikom promjene imena ra�unala."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "ne mogu prona�i niti jednu mre�nu karticu"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Pode�avam mre�u"
-
-#: ../../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 ""
-"Molim unesite ime ra�unala ukoliko ga znate.\n"
-"Neki DHCP serveri zahtjevaju specifiranje imena ra�unala da bi radili.\n"
-"Va�e ime ra�unala bi trebalo biti potpuno-kvalificirano ime ra�unala,\n"
-"kao �to je ``mybox.mylab.myco.com''."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Ime ra�unala"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6397,7 +6018,7 @@ msgstr ""
 "Jednostavno prihvatite ovaj ure�aj konfiguriran.\n"
 "Promjena polja ni�e �e prepisati ovu konfiguraciju."
 
-#: ../../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"
@@ -6407,38 +6028,38 @@ msgstr ""
 "Svaka stavka treba biti unesena kao  IP adresa odvojena\n"
 "to�kama (npr. 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 "Pode�avam mre�ni ure�aj %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (upravlja�ki program $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (upravlja�ki program %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 adresa"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "Netmaska"
 
-#: ../../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 "Automatski 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 adresa treba biti oblika 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"
@@ -6450,43 +6071,150 @@ msgstr ""
 "primjerice mojeracunalo.odjel.domena.hr.\n"
 "Tako�er unesite IP adresu gateway ra�unala ako gateway postoji"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNS poslu�itelj"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Gateway ure�aj"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Postava proxy-a"
 
-#: ../../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 treba biti http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Proxy treba biti ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Postava Interneta"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Da li �elite poku�ati spajanje na Internet ?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Testiram va�u vezu..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Sustav je sada spojen na Internet."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Zbog sigurnosnih razloga, biti �e sada odspojen."
+
+#: ../../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 ""
+"�ini se kako sustav nije spojen na internet.\n"
+"Probajte ponovno podesiti va�u vezu."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Postava Veze"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Molim ispunite ili provjerite vrijednost doljnjeg polja"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ kartice"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Memorija kartice (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "IO kartice"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "IO_0 kartice"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "IO_1 kartice"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Va� osobni telefonski broj"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Ime ISP pru�atelja (npr. provider.hr)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Telef. broj pru�atelja"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Pru�ateljev DNS 1 (opciono)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Pru�ateljev DNS 2 (opciono)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Odaberite tipkovnicu"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Na�in biranja"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "Tip veze: "
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Tip veze: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Korisni�ko ime"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Korisni�ka Lozinka"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Pro�irene particije nisu podr�ane na ovoj platformi"
 
-#: ../../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 "
@@ -6496,26 +6224,21 @@ msgstr ""
 "Jedino rje�enje je da pomaknete va�u primarnu particiju kako bi rupa bila\n"
 "odmah do pro�irenih particija."
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Gre�ka prilikom �itanja datoteke %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Vra�anje iz datoteke %s nije uspjelo: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Lo�a backup datoteka"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Gre�ka prilikom pisanja u datoteku %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"
@@ -6545,49 +6268,212 @@ msgstr "lijepo"
 msgid "maybe"
 msgstr "mo�da"
 
-#: ../../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 "Lokalni pisa�"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Postavke udaljenog pisa�a"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Udaljeni CUPS poslu�itelj"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Udaljeni lpd poslu�itelj"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Mre�ni pisa� (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 "Ispisni poslu�itelj"
 
-#: ../../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 Ure�aja pisa�a"
 
-#: ../../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 "(modul %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Odaberite vezu pisa�a"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Kako je pisa� povezan?"
+
+#: ../../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 ""
+"Sa udaljenim CUPS poslu�iteljem, ne morate konfigurirati\n"
+"nijedan pisa� ovdje; pisa�i �e biti automatski detektirani.\n"
+"U slu�aju nedoumice. izaberite \"Udaljeni CUPS poslu�itelj\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Niti jedan"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Izaberite uobi�ajenog korisnika:"
+
+#: ../../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 "Zatvori"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Postavke udaljenog pisa�a"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP adresa treba biti oblika 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Broj porta bi trebao biti numeri�ki"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Lokalni pisa�"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "IP CUPS poslu�itelja"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Postava Stila Podizanja"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Otkrivanje ure�aja..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Isku�aj portove"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Pisa�, model \"%s\", je otkriven na "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Ure�aj lokalnog pisa�a"
 
-#: ../../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"
@@ -6595,37 +6481,60 @@ msgstr ""
 "Na koji ure�aj je va� pisa� spojen \n"
 "(napomena: /dev/lp0 je jednak LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Ure�aj pisa�a"
 
-#: ../../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 "�itam CUPS bazu upravlja�kih programa..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Postavke udaljenog lpd pisa�a"
 
-#: ../../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 ""
 "Ukoliko �elite koristiti udaljeni lpd red morate unijeti\n"
 "ime ispisnog poslu�itelja te ime reda na poslu�itelju\n"
 "na koji �elite ispisivati."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
+msgstr "Udaljeno ra�unalo"
+
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Postavke udaljenog pisa�a"
+
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
 msgstr "Udaljeno ra�unalo"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Udaljeni red"
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Udaljeno ra�unalo"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Postavke SMB (Windows 9x/NT) pisa�a"
 
-#: ../../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"
@@ -6640,29 +6549,37 @@ msgstr ""
 "ime dijeljenog resursa za pisa� kojem �elite pristupiti i bilo koje\n"
 "primjenjivo korisni�ko ime, lozinku ili informacije o radnoj grupi."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "SMB poslu�itelj"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP SMB poslu�itelja"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Ime sharea"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Radna grupa"
 
-#: ../../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 "Postavke NetWare pisa�a"
 
-#: ../../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."
@@ -6672,59 +6589,228 @@ msgstr ""
 "njegovog TCP/IP imena ra�unala!) kao i ime ispisnog reda za pia� koji\n"
 "�elite pristupiti kao i primjenjivo korisni�ko ime i lozinku."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Ispisni poslu�itelj"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Ime reda pisa�a"
 
-#: ../../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 "Opcije socket pisa�a"
 
-#: ../../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 ""
 "Za ispis na socket pisa�, trebate navesti \n"
 "ime poslu�itelja od printera te opciono broj porta."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Ime poslu�itelja printera"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Port"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "Ime poslu�itelja printera"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "URI Ure�aja pisa�a"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Mo�ete specifirati direktno URI za pristup pisa�u sa CUPS-om."
+#: ../../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 "Ime pisa�a"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Opis"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Lokacija"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "�itam CUPS bazu upravlja�kih programa..."
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "Veza pisa�a"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "Kakav tip pisa�a posjedujete?"
 
-#: ../../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 "Postavke modema"
+
+#: ../../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 "Postava Interneta"
+
+#: ../../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 "Da li �elite isku�ati pisa�?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Isku�aj portove"
+
+#: ../../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 "Da, ispi�i obje probne stranice"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Pisa�"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Standardni alati"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Ispisujem probnu stranicu(e)..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Ispisujem probnu stranicu(e)..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Ispisujem probnu stranicu(e)..."
 
-#: ../../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 ""
 "Probna stranica(e) poslana je na pisa�.\n"
 "Ponekad je potrebno par sekundi prije nego pisa� po�ne s ispisom.\n"
@@ -6733,235 +6819,605 @@ msgstr ""
 "\n"
 "Da li sve radi kako treba?"
 
-#: ../../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 ""
 "Probna stranica(e) poslana je na pisa�.\n"
 "Ponekad je potrebno par sekundi prije nego pisa� po�ne s ispisom.\n"
 "Da li sve radi kako treba?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Da, ispi�i ASCII probnu stranicu"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Da, ispi�i PostScript probnu stranicu"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Nema pisa�a"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Da, ispi�i obje probne stranice"
+#: ../../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 "Postavke pisa�a"
+#: ../../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 "Onemogu�ujem mre�u"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Postavke pisa�a"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Veli�ina papira"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "�itam CUPS bazu upravlja�kih programa..."
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Izbaci stranu poslije posla?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Postava Interneta"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Postavke uniprinter pokreta�kog programa"
+#: ../../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 "Opcije dubine boje"
+#: ../../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 "Ispi�i tekst kao 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 "Popravi stepenasti 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 "Broj stranica po izlaznim stranicama"
+#: ../../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 "Desna/lijeva margina u to�kama (1/72 in�a)"
+#: ../../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 "Gornja/donja margina u to�kama (1/72 in�a)"
+#: ../../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 "Dodatne GhostScript opcije"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Dodatne Tekst opcije"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Obrni redoslijed stranica"
+#: ../../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 "Da li �elite podesiti pisa�?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "Ime pisa�a mo�e sadr�avati samo slova, brojeve i podvlaku"
 
-#: ../../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 ""
-"Slijede�e su redovi pisa�a.\n"
-"Mo�ete dodati jo� koji ili urediti postoje�i."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS pokretanje"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Nema pisa�a"
+
+#: ../../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 "�itam CUPS bazu upravlja�kih programa..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Odaberite vezu pisa�a"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Postavke pisa�a"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Kako je pisa� povezan?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Pokre�em va�u vezu..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Odaberite vezu udaljenog pisa�a"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Podesi mre�u"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Niste podesili monitor"
+
+#: ../../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 ""
-"Sa udaljenim CUPS poslu�iteljem, ne morate konfigurirati\n"
-"nijedan pisa� ovdje; pisa�i �e biti automatski detektirani.\n"
-"U slu�aju nedoumice. izaberite \"Udaljeni CUPS poslu�itelj\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Pode�avam mre�u"
+
+#: ../../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 ""
-"Sa udaljenim CUPS poslu�iteljem, ne morate konfigurirati\n"
-"nijedan pisa� ovdje; pisa�i �e biti automatski detektirani\n"
-"ukoliko nemate poslu�itelj na drugoj mre�i; u tom slu�aju,\n"
-"morate dati IP adresu CUPS poslu�itelja i opciono broj porta."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "IP CUPS poslu�itelja"
+#: ../../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 "Broj porta bi trebao biti numeri�ki"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Koji ispisni sustav �elite koristiti?"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Ukloni red"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Visok"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoidan"
+
+#: ../../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 "Ime pisa�a mo�e sadr�avati samo slova, brojeve i podvlaku"
+"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 "Koji ispisni sustav �elite koristiti?"
 
-#: ../../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 ""
-"Svaki pisa� treba ime (naprimjer lp).\n"
-"Drugi parametri kao opis pisa�a ili njegova lokacija\n"
-"mo�e biti definirana. Koje ime �e biti kori�teno za ovaj pisa� i\n"
-"kako je pisa� povezan?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Ime pisa�a"
+#: ../../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 "Opis"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Lokacija"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "Odaberite vezu pisa�a"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Koji ispisni sustav �elite koristiti?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Podesi pisa�"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Postavke pisa�a"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "�itam CUPS bazu upravlja�kih programa..."
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "Da li �elite podesiti pisa�?"
+
+#: ../../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 ""
-"Svaki ispisni red (gdje se �alju poslovi ispisa) treba\n"
-"ime (�esto lp) i posredni�ki direktorij vezan uz njega. Koje\n"
-"ime i direktorij �e se koristiti za ovaj red i kako je pisa� povezan?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Ime reda"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Normalni mod"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Posredni�ki direktorij"
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Uobi�ajeno)"
 
-#: ../../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 "Udaljeni CUPS poslu�itelj"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Udaljeni CUPS poslu�itelj"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Nema pisa�a"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Da li �elite isku�ati postavu ?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Postavke modema"
+
+#: ../../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 "Dijeljenje Internet Veze"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
 msgstr "Veza pisa�a"
 
-#: ../../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 "Ispisujem probnu stranicu(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
+#, fuzzy
+msgid "Remove printer"
+msgstr "Postavke udaljenog pisa�a"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "�itam CUPS bazu upravlja�kih programa..."
+
+#: ../../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 "Da li �elite ponovno pokrenuti mre�u?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "�itam CUPS bazu upravlja�kih programa..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "Postava proxy-a"
+
+#: ../../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 ""
+"Dobro do�li u pomo�ni program za konfiguriranje proxy-a.\n"
+"\n"
+"Ovdje �ete mo�i postaviti va� http i ftp proxi-e\n"
+"sa ili bez logina i lozinke\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 ""
+"Molimo popunite http proxy informacije\n"
+"Molimo ostavite prazno ukoliko ne �elite 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 "port"
+
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "Url treba po�eti sa 'http:'"
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "Broj porta bi trebao biti numeri�ki"
+
+#: ../../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 ""
+"Molimo unesite ftp proxy informacije\n"
+"Ostavite prazno ukoliko ne �elite ftp proxy"
+
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "Url treba po�eti sa '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 ""
+"Molimo unesite proxy login i lozinku ukoliko postoje.\n"
+"Ostavite prazno ako ne �elite login/lozinku"
+
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "login"
+
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "lozinka"
+
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "ponovno unesite lozinku"
+
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "Lozinke se ne podudaraju. Poku�ajte ponovno!"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Ne mogu dodati particiju na _formatirani_ RAID md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Ne mogu pisati u datoteku $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Ne mogu pisati u datoteku %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid nije uspio"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid nije uspio (mo�da niste instalirali raidtools alate?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nema dovoljno particija za RAID nivo %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr "Pokreni ALSA (Naprednu Linux Zvu�nu Arhitekturu) zvu�ni sustav"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron periodno zakazivanje komandi"
 
-#: ../../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."
@@ -6970,7 +7426,7 @@ msgstr ""
 "syslog-a.\n"
 "Tako�er mo�e biti kori�ten za ga�enje ra�unala kada je baterija slaba."
 
-#: ../../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."
@@ -6979,7 +7435,7 @@ msgstr ""
 "je at pokrenut, i pokre�e batch komande kada je prosje�na zauzetost dovoljno "
 "niska."
 
-#: ../../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 "
@@ -6991,7 +7447,7 @@ msgstr ""
 "funkcija obi�nom UNIX cron-u, uklju�uju�i bolju sigurnost i ve�u snagu "
 "konfiguracijskih opcija."
 
-#: ../../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 "
@@ -7003,7 +7459,7 @@ msgstr ""
 "operacije,\n"
 "i uklju�uje podr�ku za isko�ive menije u konzoli."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
@@ -7011,7 +7467,7 @@ msgstr ""
 "HardDrake pokre�e isprobavanje hardware-a, i opciono konfigurira\n"
 "novi/promjenjeni hardware."
 
-#: ../../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."
@@ -7019,7 +7475,7 @@ msgstr ""
 "Apache je World Wide Web poslu�itelj. Koristi se za poslu�ivanje HTML\n"
 "dokumenata i CGI skripti."
 
-#: ../../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 "
@@ -7034,7 +7490,7 @@ msgstr ""
 "a\n"
 "onemogu�uje sve servise za koje je zadu�en."
 
-#: ../../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."
@@ -7042,7 +7498,7 @@ msgstr ""
 "Pokre�e paketno filtriranje za Linux kernel 2.2 serije, za postavljanje\n"
 "vatrozida za za�titu va�eg ra�unala od mre�nih napada."
 
-#: ../../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"
@@ -7052,7 +7508,7 @@ msgstr ""
 "/etc/sysconfig/keyboard. Ona se mo�e odabrati koriste�i kbdconfig alat.\n"
 "Trebali biste ostaviti ovo uklju�eno za ve�inu ra�unala."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
@@ -7060,11 +7516,11 @@ msgstr ""
 "Automatsko regeneriranje kernel header-a u /boot za\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 "Automatska detekcija i konfiguracija hardware-a pri podizanju."
 
-#: ../../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."
@@ -7072,7 +7528,7 @@ msgstr ""
 "Linuxconf �e ponekada urediti izvr�avanje raznih radnji\n"
 "pri samom podizanju kako bi odr�ao sustavsku konfiguraciju."
 
-#: ../../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)."
@@ -7080,7 +7536,7 @@ msgstr ""
 "lpd je daemon za ispis koji je potreban od lpr-a kako bi radio ispravno.\n"
 "On je pojednostavljeno poslu�itelj koji �alje ispisne poslove pisa�u(ima)."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
@@ -7088,7 +7544,7 @@ msgstr ""
 "Linux Virtualni Poslu�itelj, koristi se za pravljenje visoko raspolo�ivog\n"
 "poslu�itelja visokih performansi."
 
-#: ../../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."
@@ -7096,7 +7552,7 @@ msgstr ""
 "named (BIND) je Domain Name Server (DNS) poslu�itelj koji se upotrebljava\n"
 "za razlu�ivanje imena ra�unala u IP adrese."
 
-#: ../../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."
@@ -7104,7 +7560,7 @@ msgstr ""
 "Montira i Demontira sve Mre�ne datote�ne sustave (NFS), SMB (Lan\n"
 "Manager/Windows), i NCP (NetWare) to�ke montiranja."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -7112,7 +7568,7 @@ msgstr ""
 "Aktivira/Deaktivira sva pode�ena mre�na su�elja prilikom pokretanja\n"
 "sustava."
 
-#: ../../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"
@@ -7122,7 +7578,7 @@ msgstr ""
 "Ovaj servis pru�a NFS poslu�iteljsku funkcionalnost, koji se konfigurira\n"
 "putem /etc/exports datoteke."
 
-#: ../../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."
@@ -7130,7 +7586,7 @@ msgstr ""
 "NFS je popularan protokol za dijeljenje datoteka putem TCP/IP mre�a.\n"
 "Ovaj servis pru�a funkcionalnost NFS datote�nog zaklju�avanja."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
@@ -7138,11 +7594,11 @@ msgstr ""
 "Automatski uklju�uje numlock tipku u konzoli i\n"
 "XFree-u pri podizanju."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr "Podr�ava OKI 4w i kompaktibilne win pisa�e."
 
-#: ../../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 "
@@ -7154,7 +7610,7 @@ msgstr ""
 " konfigurirana zato je sigurno pokrenuti ju iako na instaliranom\n"
 " ra�unalu ne treba."
 
-#: ../../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 "
@@ -7165,7 +7621,7 @@ msgstr ""
 "poput NFS-a ili NIS-a. Portmap poslu�itelj mora biti pokrenut na ra�unalima\n"
 "koji su poslu�itelji za protokole koji se slu�e RPC mehanizmima."
 
-#: ../../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."
@@ -7173,7 +7629,7 @@ msgstr ""
 "Postfix je Mail Transport Agent, koji je program koji\n"
 "�alje mail-ove sa jedne ma�ine na drugu."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -7181,7 +7637,7 @@ msgstr ""
 "Sprema i vra�a sustavsku entropiju za ve�u kvalitetu generiranja\n"
 "slu�ajnih brojeva."
 
-#: ../../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"
@@ -7189,7 +7645,7 @@ msgstr ""
 "Dodjeljuje raw ure�aje (kao �to su hard disk\n"
 "particije), za uporabu u aplikacijama kao �to su 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"
@@ -7200,7 +7656,7 @@ msgstr ""
 "kompleksniji\n"
 "ruting protokoli su potrebni za kompleksnije mre�e."
 
-#: ../../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."
@@ -7208,7 +7664,7 @@ msgstr ""
 "Rstat protokol omogu�ava korisnicima na mre�i da dohvate\n"
 "mjerljive performanse za svako ra�unalo koje je na mre�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."
@@ -7216,7 +7672,7 @@ msgstr ""
 "Rusers protokol omogu�ava korisnicima na mre�i da identificira tko je\n"
 "prijavljen na drugim ra�unalima koja odgovaraju."
 
-#: ../../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)."
@@ -7225,11 +7681,11 @@ msgstr ""
 "korisnika prijavljenih na ra�unalo na kojima je pokrenut rwho (sli�no finger-"
 "u)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
 msgstr "Pokreni zvu�ni sustav na va�em ra�unalu"
 
-#: ../../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."
@@ -7238,31 +7694,70 @@ msgstr ""
 "u razli�ite sustavske log datoteke. Dobra je ideja uvijek imati pokrenuti "
 "syslog."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr "U�itava upravlja�ke programe za va�e usb ure�aje."
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr "Pokre�e X Pismovni Poslu�itelj (ovo je nu�no za XFree da se pokrene)."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Izaberite koji servisi trebaju biti startani automatski kod boot-a"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Pisa�"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Sistemski mod"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Postavke udaljenog lpd pisa�a"
+
+# ../../share/compssUsers
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Baze"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "ure�aj"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "pokre�em"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "zaustavljen"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Servisi i daemoni"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -7270,11 +7765,16 @@ msgstr ""
 "Nema dodatnih informacija\n"
 "o ovom servisu, �alim."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "Pri pokretanju"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Instaliram paket %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 +7782,66 @@ msgstr ""
 "Ne mogu pro�itati va�u particijsku tablicu, previ�e je uni�tena za mene :(\n"
 "Poku�ati �u sa brisanjem lo�ih particija"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Gre�ka"
+
+#: ../../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 "Postava nakon instalacije"
+
+#: ../../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 "Postava Stila Podizanja"
+
+#: ../../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 "�estitke!"
+
+#: ../../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 "Dijeljenje Internet Veze"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Dijeljenje veze prema internetu je trenutno omogu�eno"
 
-#: ../../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 +7853,31 @@ msgstr ""
 "\n"
 "�to �elite napraviti?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "onemogu�i"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "odustani"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "ponovno postavi"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Onemogu�ujem poslu�itelje..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Dijeljenje veze prema Internetu je trenutno onemogu�eno."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Dijeljenje veze prema Internetu je trenutno onemogu�eno"
 
-#: ../../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 +7889,19 @@ msgstr ""
 "\n"
 "�to �elite napraviti?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "omogu�i"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "Omogu�ujem poslu�itelje..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Dijeljenje veze prema internetu je trenutno omogu�eno."
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Sadr�aj konfiguracijske datoteke ne mo�e biti interpretiran."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Neprepoznata konfiguracijska datoteka"
-
-#: ../../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 "
@@ -7374,21 +7917,21 @@ msgstr ""
 "Upozorenje: trebati �ete primjenjeni Mre�ni Ure�aj za postavljanje lokalne "
 "mre�e (LAN)."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Me�usklop %s (koristi modul %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
 msgstr "Me�usklop %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Nema mre�nog adaptera na va�em sustavu!"
 
-#: ../../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."
@@ -7397,6 +7940,10 @@ msgstr ""
 "hardware-ski konfiguracijski alat."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Mre�ni me�usklop"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7411,30 +7958,31 @@ msgstr ""
 "\n"
 "Postaviti �u lokalnu mre�u (LAN) sa tim adapterom."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
 "Molimo odaberite koji mre�ni adapter �e biti povezan na va�u lokalnu mre�u."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Upozorenje, va� mre�ni adapter je ve� konfiguriran. Ponovno �u ga "
 "konfigurirati."
 
-#: ../../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 ""
-"Potencijalni LAN adresni konflikt je prona�en u trenutnoj konfiguraciji $_!\n"
+"Potencijalni LAN adresni konflikt je prona�en u trenutnoj konfiguraciji %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Detektirana je vatrozidna konfiguracija!"
 
-#: ../../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."
@@ -7442,23 +7990,20 @@ msgstr ""
 "Upozorenje! Postoje�a vatrozidna konfiguracija je prona�ena. Morati �ete "
 "ru�no popraviti neke dijelove nakon instalacije."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Pode�avam..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Pode�avam skriptove, instaliram softver, pokre�em poslu�itelje..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Problem prilikom instaliranja paketa $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "�estitke!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Problem prilikom instaliranja paketa %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 "
@@ -7468,23 +8013,23 @@ msgstr ""
 "Sada mo�ete dijeliti va�u internet vezu sa drugim ra�unalima na va�oj "
 "lokalnoj mre�i, koriste�i automatsku mre�nu konfiguraciju (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "Postavljanje je ve� ura�eno, ali je trenutno onemogu�eno."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "Postavljanje je ve� ura�eno, ali je trenutno omogu�eno."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Dijeljenje veze prema internetu nije bilo konfigurirano."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Postavke dijeljenja internet veze"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7499,83 +8044,82 @@ msgstr ""
 "\n"
 "Kliknite na Postavke ukoliko �elite pokreniti �arobnjak za postavljanja."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Mre�ne postavke (%d adaptera)"
 
-#: ../../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 "Obri�i profil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Profil za obrisati:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Novi profil..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Ime profila za napraviti:"
+#: ../../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 "Ime ra�unala: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Internet pristup"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tip:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "Me�usklop:"
 
-#: ../../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 "Povezan"
 
-#: ../../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 "Nije povezan"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Pove�i..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Odspoji..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
 msgstr "Pokre�em va�u vezu..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "Zatvaram va�u vezu..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7587,51 +8131,52 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "u root-u."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "Sustav je sada odspojen sa Interneta."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Pode�avanje Internet Pristupa..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "LAN postavke"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adapter"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Upravlja�ki program"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Me�usklop"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Status:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Podesi lokalnu mre�u..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Normalni mod"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Primjeni"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Molimo pri�ekajte... Primjenjujem konfiguraciju"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
@@ -7639,36 +8184,38 @@ msgstr ""
 "Nemate niti jedan konfigurirani me�usklop.\n"
 "Konfigurirajte ga prvo klikanjem na 'Postavljanje'"
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "LAN postavke"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "Boot protokol"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Pokrenuto pri podizanju"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "DHCP klijent"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Onemogu�i"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Aktivno"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Omogu�i"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Aktivno"
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
@@ -7676,35 +8223,27 @@ msgstr ""
 "Nemate niti jednu internet vezu.\n"
 "Napravite jednu klikanjem na 'Podesi'"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Postava Internet veze"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Postava Internet veze"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Tip veze: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parametri"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Pru�ateljev DNS 1 (opciono)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Pru�ateljev DNS 2 (opciono)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Ethernet kartica"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP klijent"
 
@@ -7776,15 +8315,30 @@ msgstr ""
 "Uzimamo zna�ajke 4 razine, ali sada je sustav potpuno zatvoren.\n"
 "Sigurnosne zna�ajke su na njihovim maksimumima."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Pode�avam sigurnosni nivo"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Postavke poslu�itelja"
+
+#: ../../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 "Pode�avam sigurnosni nivo"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Kontrolni Centar"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Izaberite alat koje �elite koristiti"
 
@@ -7813,83 +8367,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Ne mogu pokrenuti �ivu nadogradnju !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "niti jedan serial_usb nije prona�en\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Emuliranje tre�e tipke?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Molimo istestirajte mi�a."
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "Pra�enje mre�e"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Statistike"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "Brzina Slanja: "
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "Brzina Primanja: "
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Zatvori"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "Spajam se na Internet "
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "Prekidam vezu na Internet "
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "Prekidanje veze prema Internetu neuspje�no."
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "Prekidanje veze prema Internetu zavr�eno."
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Veza uspostavljena."
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"Veza neuspje�no uspostavljena.\n"
-"Provjerite va�e postavke u Mandrake kontrolnom centru."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "poslano: "
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "primljeno: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Pove�i"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Odspoji"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Vatrozidne postave"
@@ -7920,21 +8405,89 @@ msgstr ""
 "\n"
 "Kliknite na Podesi za postavljanje standardnog vatrozida"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Odaberite jezik"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Odaberite razred instalacije"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Otkrivanje hard diskova"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Podesi mi�"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Odaberite tipkovnicu"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Sigurnost"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Podesi datote�ne sustave"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formatiraj particije"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Izabir instaliranih paketa"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Instaliraj sustav"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Dodaj korisnika"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Podesi mre�u"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Pode�avanje servisa"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Napravi boot disketu"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Instaliraj bootloader"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Podesi X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Izlaz iz instalacije"
+
+#: ../../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 pode�avanje\n"
 "\n"
-"Ovo pode�ava osobni vatrozid za ovo Linux Mandrake ra�unalo.\n"
+"Ovo pode�ava osobni vatrozid za ovo Mandrake Linux ra�unalo.\n"
 "Za sna�no primjenjena vatrozidna rje�enja, molimo pogledajte\n"
 "specijaliziranu MandrakeSecurity Firewall distribuciju."
 
-#: ../../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"
@@ -7952,7 +8505,7 @@ msgstr ""
 "vatrozid. Mo�ete promjeniti ovu konfiguraciju bilo kad za�elite\n"
 "pokretanjem ponovno ove aplikacije!"
 
-#: ../../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"
@@ -7964,7 +8517,7 @@ msgstr ""
 "samo sa ovog ra�unala, mo�ete sigurno odgovoriti NE ovdje.\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"
@@ -7977,7 +8530,7 @@ msgstr ""
 "odgovorite ne.\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"
@@ -7993,7 +8546,7 @@ msgstr ""
 "koristite\n"
 "ssh je enkriptiran i nedozvoljava prislu�kivanje (sniffanje)."
 
-#: ../../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"
@@ -8005,7 +8558,7 @@ msgstr ""
 "jako preporu�amo odgovaranjem Ne ovdje i kori�tenjem ssh-a umjesto\n"
 "telnet-a.\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"
@@ -8017,7 +8570,7 @@ msgstr ""
 "anonimni prijenos. Svaka lozinka prenesena FTP-om mo�e biti ukradena od\n"
 "nekih napada�a, jer FTP tako�er ne koristi enkripciju za prijenos lozinki.\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"
@@ -8029,7 +8582,7 @@ msgstr ""
 "vjerojatno ga koristite. Ako ne, trebali biste ga odijeliti vatrozidom.\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"
@@ -8041,7 +8594,7 @@ msgstr ""
 "ovog ra�unala.\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"
@@ -8053,7 +8606,7 @@ msgstr ""
 "(dinami�ki dodjeljenja), moramo to dozvoliti. Da\n"
 "li je to slu�aj?\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"
@@ -8067,7 +8620,7 @@ msgstr ""
 "niste dio ve�eg ureda ili niste �uli za ovo, vjerojatno\n"
 "ne."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -8079,46 +8632,20 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Ne mogu otvoriti %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Ne mogu otvoriti %s za pisanje: %s\n"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klijenti za razne protokole uklju�uju�i ssh"
-
-#: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Razvoj"
-
-#: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Radna stanica"
-
-# ../../share/compssUsers
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Vatrozid/Ruter"
-
-# ../../share/compssUsers
-#: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Osobni informacijski menad�ment"
-
-#: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedija - Grafika"
-
-#: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer (client)"
@@ -8126,34 +8653,30 @@ msgstr "Mre�no ra�unalo (klijent)"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Audio-namjenjeni alati: mp3 ili midi svira�i, mikseri, itd"
-
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet stanica"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS poslu�itelj, SMB poslu�itelj, Proxy poslu�itelj, SSH poslu�itelj"
 
 #: ../../share/compssUsers:999
 msgid "Office"
 msgstr "Ured"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedijska stanica"
+msgid "Gnome Workstation"
+msgstr "Gnome radna stanica"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Pribor alata za �itanje i slanje mail-a i news-a (pine, mutt, tin..) i za "
-"pregled Web-a"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Alati za va� Palm Pilot ili va� Visor"
+
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Radna stanica"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C i C++ razvojne biblioteke, programi i uklju�uju�e datoteke"
+msgid "Firewall/Router"
+msgstr "Vatrozid/Ruter"
 
 #: ../../share/compssUsers:999
 msgid "Domain Name and Network Information Server"
@@ -8161,40 +8684,53 @@ msgstr "Ime Domene i Mre�ni Informacijki Poslu�itelj (NIS)"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programi za ure�ivanje va�ih financija, poput gnucash-a"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Uredski programi: tekst procesori (kword, abiword), tabli�ni kalkulatori "
+"(kspread, gnumeric), pdf preglednici, itd"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ili MySQL poslu�itelj baza"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Audio-namjenjeni alati: mp3 ili midi svira�i, mikseri, itd"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS poslu�itelj, SMB poslu�itelj, Proxy poslu�itelj, SSH poslu�itelj"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knjige i Howto-i o Linux-u i slobodnom software-u"
 
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacija"
+msgid "KDE Workstation"
+msgstr "KDE radna stanica"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
 
+#: ../../share/compssUsers:999
+msgid "Multimedia - Video"
+msgstr "Multimedija - Video"
+
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Pomo�ni programi"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Database"
+msgstr "Baze"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafi�ko Okru�je"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ili MySQL poslu�itelj baza"
+
+#: ../../share/compssUsers:999
+msgid "Tools to ease the configuration of your computer"
+msgstr "Alati za lako pode�avanje va�eg ra�unala"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia - Sound"
@@ -8202,199 +8738,1480 @@ msgstr "Multimedija - Zvuk"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Zabavni programi: arkade, plo�e, strategije, itd"
+msgid "Utilities"
+msgstr "Pomo�ni programi"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video playeri i ure�iva�i"
+msgid "Documentation"
+msgstr "Dokumentacija"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid "Console Tools"
 msgstr "Konzolni Alati"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Zvu�ni i video svira�ki/ure�iva�ki programi"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix mail poslu�itelj, Inn news poslu�itelj"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Znanstvena radna stanica"
+msgid "Internet station"
+msgstr "Internet stanica"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Ure�iva�i, ljuske, datote�ni alati, terminali"
+msgid "Multimedia station"
+msgstr "Multimedijska stanica"
+
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Configuration"
+msgstr "LAN postavke"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knjige i Howto-i o Linux-u i slobodnom software-u"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Vi�e grafi�kih radnih okru�ja (Gnome, IceWM)"
 
 # ../../share/compssUsers
 #: ../../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 ""
-"Grafi�ka okru�ja sa korisni�ki prijateljskim skupom aplikacija i alatima za "
-"radno okru�je"
+"K Radno Okru�je, osnovno grafi�ko okru�je sa kolekcijom pripadaju�ih alata"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix mail poslu�itelj, Inn news poslu�itelj"
+msgid "Graphical Environment"
+msgstr "Grafi�ko Okru�je"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Igre"
+msgid "Development"
+msgstr "Razvoj"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedija - Video"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache i Pro-ftpd"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Mre�ni ra�unalni poslu�itelj"
+msgid "Tools to create and burn CD's"
+msgstr "Alati za pravljenje i pr�enje CD-a"
+
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Uredska radna stanica"
+
+# ../../share/compssUsers
+#: ../../share/compssUsers:999
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itd"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid "Graphics programs such as The Gimp"
 msgstr "Grafi�ki programi poput Gimp-a"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Uredska radna stanica"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Radno Okru�je, osnovno grafi�ko okru�je sa kolekcijom pripadaju�ih alata"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C i C++ razvojne biblioteke, programi i uklju�uju�e datoteke"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Vi�e grafi�kih radnih okru�ja (Gnome, IceWM)"
+msgid "Network Computer server"
+msgstr "Mre�ni ra�unalni poslu�itelj"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Alati za pravljenje i pr�enje CD-a"
+msgid "Mail/Groupware/News"
+msgstr "Mail/Groupware/News"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedija - CD pr�enje"
+msgid "Game station"
+msgstr "Igra�ka radna stanica"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Archiving, emulators, monitoring"
-msgstr "Arhiviranje, emulatori, pra�enje"
+msgid "Video players and editors"
+msgstr "Video playeri i ure�iva�i"
+
+#: ../../share/compssUsers:999
+msgid "Multimedia - Graphics"
+msgstr "Multimedija - Grafika"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Baze"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Zabavni programi: arkade, plo�e, strategije, itd"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Uredski programi: tekst procesori (kword, abiword), tabli�ni kalkulatori "
-"(kspread, gnumeric), pdf preglednici, itd"
+"Pribor alata za �itanje i slanje mail-a i news-a (pine, mutt, tin..) i za "
+"pregled Web-a"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Poslu�itelj"
+msgid "Archiving, emulators, monitoring"
+msgstr "Arhiviranje, emulatori, pra�enje"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid "Personal Finance"
 msgstr "Osobne financije"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Postavke"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE radna stanica"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafi�ka okru�ja sa korisni�ki prijateljskim skupom aplikacija i alatima za "
+"radno okru�je"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Druga grafi�ka radna okru�ja"
+msgid "Clients for different protocols including ssh"
+msgstr "Klijenti za razne protokole uklju�uju�i ssh"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache i Pro-ftpd"
+msgid "Internet gateway"
+msgstr "Internet gateway"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Mail/Groupware/News"
+msgid "Sound and video playing/editing programs"
+msgstr "Zvu�ni i video svira�ki/ure�iva�ki programi"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome radna stanica"
+msgid "Other Graphical Desktops"
+msgstr "Druga grafi�ka radna okru�ja"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet gateway"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Ure�iva�i, ljuske, datote�ni alati, terminali"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Alati za va� Palm Pilot ili va� Visor"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programi za ure�ivanje va�ih financija, poput gnucash-a"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Igra�ka radna stanica"
+msgid "Games"
+msgstr "Igre"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itd"
+msgid "Personal Information Management"
+msgstr "Osobni informacijski menad�ment"
 
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Alati za lako pode�avanje va�eg ra�unala"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedija - CD pr�enje"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
+msgid "Scientific Workstation"
+msgstr "Znanstvena radna stanica"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "ne mogu otvoriti /etc/sysconfig/autologin za �itanje: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Da li �elite ponovno pokrenuti mre�u?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Da li se sla�ete?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Poku�avam ponovno pokrenuti mre�ni ure�aj:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Poku�avam ponovno pokrenuti mre�ni ure�aj %s. Da li se sla�ete?"
+
+#, 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 ""
+#~ "Ako niste sigurni uobi�ajeni izbor je \"/dev/hda\" (primarni \n"
+#~ "master IDE disk) ili \"/dev/sda\" (prvi SCSI disk)."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Slijede�e su redovi pisa�a.\n"
+#~ "Mo�ete dodati jo� koji ili urediti postoje�i."
+
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Tip veze: "
+
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Izaberite uobi�ajenog korisnika:"
+
+#~ msgid "Test the mouse here."
+#~ msgstr "Molimo istestirajte mi�a ovdje."
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr ""
+#~ "Molimo, izaberite preferirani jezik za instalaciju i kori�tenje sustava."
+
+#~ 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 ""
+#~ "Trebate prihvatiti stavke gorenje licence da bi nastavili instalaciju.\n"
+#~ "\n"
+#~ "\n"
+#~ "Molimo kliknite na \"Prihvati\" ukoliko se sla�ete sa njezinim stavkama.\n"
+#~ "\n"
+#~ "\n"
+#~ "Molimo kliknite na \"Odbij\" ukoliko se ne sla�ete sa njezinim stavkama.\n"
+#~ "Instalacija �e zavr�iti bez ikakvih promjena na va�oj trenutnoj postavi."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr ""
+#~ "Izaberite raspored tipkovnice koji se podudara sa va�om na gornjem popisu"
+
+#~ 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 ""
+#~ "Ukoliko �elite drugi jezik (od onoga kojega ste odabrali\n"
+#~ "na po�etku instalacije) da bude raspolo�iv poslije instalacije, molimo "
+#~ "odaberite ga u popisu gore. Ako �elite odabrati sve, izaberite samo \"Sve"
+#~ "\"."
+
+#~ 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 ""
+#~ "Odaberite:\n"
+#~ "\n"
+#~ "  - Prilago�eno: Ukoliko ste upoznati s Linuxom kori�tenjem ove\n"
+#~ "opcije mo�i �e te odabrati kakvu instalaciju �elite npr. normalna, "
+#~ "programer\n"
+#~ "ili poslu�itelj. Odaberite \"Normalna\" za sustav op�e namjene.\n"
+#~ "Odaberite \"Programer\" ako �elite koristiti ra�unalo primarno za razvoj\n"
+#~ "softvera ili odaberite \"Poslu�itelj\" ako �elite koristiti ra�unalo kao\n"
+#~ "poslu�itelj op�e namjene npr. za mail, web, ispisivanje itd.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Stru�njak: Ukoliko ste vrlo dobro upoznati sa Linuxom i �elite\n"
+#~ "imati potpunu kontrolu nad instalacijom Linuxa odaberite opciju\n"
+#~ "\"Stru�njak\". Sli�no kao i sa \"Prilago�eno-m\" instalacijom mo�i\n"
+#~ "�e te odabrati kako �e se sustav upotrebljavati me�utim sa dodatnim "
+#~ "opcijama."
+
+#~ 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 ""
+#~ "Sada morate definirati upotrebu va�eg ra�unala. Izbori su:\n"
+#~ "\n"
+#~ "* Radna stanica: ovo je idealan izbor ukoliko planirate koristiti va�e "
+#~ "ra�unalo primarno za svakodnevno kori�tenje, u uredu ili\n"
+#~ "  kod ku�e.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Razvoj: ukoliko planirate koristiti va�e ra�unalo primarno za razvoj "
+#~ "software-a, to je dobar izbor. Tada\n"
+#~ "  �ete imati kompletnu kolekciju instaliranog software-a u pravilu da "
+#~ "kompajlirate, uklanjate gre�ke, i formatirate izvorni kod,\n"
+#~ "  ili za pravljenje softwareskih paketa.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Poslu�itelj: ukoliko planirate koristiti ovo ra�unalo kao poslu�itelj, "
+#~ "ovo je dobar izbor. Ili kao datote�ni poslu�itelj (NFS ili\n"
+#~ "  SMB), poslu�itelj pisa�a (Unix stil ili Microsoft Windows stil), "
+#~ "autentifikacijski poslu�itelj (NIS), poslu�itelj\n"
+#~ "  baze podataka i tako dalje. Kao takav, ne o�ekujte da �e biti ljepote "
+#~ "(KDE, GNOME, itd.) instalirane."
+
+#~ 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 ""
+#~ "Sada mo�ete odabrati grupu paketa koje �elite\n"
+#~ "instalirati ili nadograditi.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX �e tada provjeriti da li imate dovoljno mjesta za instalaciju svih "
+#~ "odabranih. Ako ne,\n"
+#~ "upozoriti �e vas o tome. Ukoliko �elite nastaviti svejedno, on �e "
+#~ "nastaviti sa\n"
+#~ "instalacijom svih odabranih grupa, ali ne�e instalirati neke pakete od "
+#~ "manjeg\n"
+#~ "interesa. Na kraju popisa mo�ete izabrati opciju \n"
+#~ "\"Individualan izbor paketa\"; u tom slu�aju morati �ete pregledati \n"
+#~ "vi�e od 1000 paketa..."
+
+#~ 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 ""
+#~ "Sada mo�ete izabrati individualno sve pakete koje\n"
+#~ "�elite instalirati.\n"
+#~ "\n"
+#~ "\n"
+#~ "Mo�ete pro�iriti ili skupiti drvo klikaju�i na opcije u lijevom kutu\n"
+#~ "prozora od paketa.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko preferirate da vidite pakete sortirane po abecednom redu, "
+#~ "pritisnite na ikonu\n"
+#~ "\"Promjeni ravno i grupno sortirano\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko ne �elite biti upozoreni o ovisnosti, pritisnite na \"Automatsku\n"
+#~ "ovisnost\". Ako �elite to, primjetite da odzna�ivanje jednog paketa mo�e "
+#~ "tiho\n"
+#~ "odzna�iti nekoliko drugih paketa koji ovise o njemu."
+
+#~ 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 ""
+#~ "Ako imate sve gore navedene CDove kliknite U redu.\n"
+#~ "Ako nemate niti jedan od tih navedenih CDa kliknite Odustani.\n"
+#~ "Ako imate samo neke od navedenih CDa odzna�ite one koje nemate i kliknite "
+#~ "U redu."
+
+#~ 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 ""
+#~ "Ukoliko �elite spojiti va�e ra�unalo na Internet ili\n"
+#~ "na lokalnu mre�u molimo izaberite ispravnu opciju. Molimo uklju�ite va� "
+#~ "ure�aj\n"
+#~ "prije nego izaberete ispravnu opciju kako bi ga DrakX automatski "
+#~ "prepoznao.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ako nemate niti jednu vezu na Internet ili na lokalnu mre�u, izaberite\n"
+#~ "\"Onemogu�i umre�avanje\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko �elite konfigurirati mre�u kasnije poslije instalacije ili ako "
+#~ "ste \n"
+#~ "zavr�ili sa konfiguriranjem va�e mre�ne veze, izaberite \"Zavr�i\"."
+
+#~ 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 ""
+#~ "Nije prona�en modem. Molimo izaberite serijski port na kojem je "
+#~ "priklju�en.\n"
+#~ "\n"
+#~ "\n"
+#~ "Za informaciju. prvi serijski port (nazvan \"COM1\" pod Microsoft\n"
+#~ "Windows-ima) se zove \"ttyS0\" pod Linux-om."
+
+#~ 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 ""
+#~ "Sada mo�ete unijeti opcije za pozivanje ISP-a. Ukoliko neznate\n"
+#~ "ili niste sigurni �to unijeti, ispravne informacije mogu se dobiti od "
+#~ "va�eg\n"
+#~ "pru�atelja Internet usluga. Ukoliko ne unesete DNS (imenski poslu�itelj)\n"
+#~ "informacije ovdje, te informacije �e biti dobivene od va�eg pru�atelja "
+#~ "Internet\n"
+#~ "usluga pri samom spajanju."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Ukoliko je va� modem vanjski modem, molimo uklju�ite ga sada kako bi ga "
+#~ "DrakX prona�ao automatski."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Molimo uklju�ite va� modem i izaberite ispravan model."
+
+#~ 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 ""
+#~ "Ukoliko niste sigurni da li su podaci gore\n"
+#~ "to�ni ili neznate �to treba unijeti, ispravne informacije\n"
+#~ "mo�ete dobiti od va�eg pru�atelja internet usluga. Ukoliko ne unesete\n"
+#~ "DNS (imenski poslu�itelj) informacije ovdje, ta �e informacije biti "
+#~ "dobivena\n"
+#~ "od va�eg pru�atelja Internet usluga pri samom spajanju."
+
+#~ 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 ""
+#~ "Sada mo�ete unijeti ime va�eg ra�unala ukoliko je potrebno. Ukoliko ne\n"
+#~ "znate ili niste sigurni �to trebate unijeti, ispravne informacije mogu\n"
+#~ "biti dobivene od va�eg pru�atelja Internet usluga."
+
+#~ 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 ""
+#~ "Sada mo�ete konfigurirati va� mre�ni ure�aj.\n"
+#~ "\n"
+#~ "  * IP adresu: ukoliko ne znate adresu pitajte svojeg mre�nog "
+#~ "administratora ili  ISP-a.\n"
+#~ "    Ne biste trebali unijeti IP adresu ukoliko ste izabrali opciju "
+#~ "\"Automatskog IP-a\" ispod.\n"
+#~ "\n"
+#~ "  * Mre�na maska: Obi�no je maska \"255.255.255.0\" dobar izbor. Ako "
+#~ "niste sigurni \n"
+#~ "raspitajte se kod mre�nog administratora.\n"
+#~ "\n"
+#~ "  * Automatski IP: Ukoliko va�a mre�a koristi BOOTP ili DHCP protokol, "
+#~ "odaberite ovu\n"
+#~ "opciju. U ovom slu�aju ne morate unijeti ni�ta pod \"IP adresa\". Ako "
+#~ "niste sigurni\n"
+#~ "raspitajte se kod mre�nog administratora."
+
+#~ 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 ""
+#~ "Sada mo�ete unijeti ime va�eg ra�unala ukoliko je potrebno. Ukoliko\n"
+#~ "ne znate ili niste sigurni �to unijeti, pitajte va�eg mre�nog "
+#~ "administratora."
+
+#~ 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 ""
+#~ "Sada mo�ete unijeti ime va�eg ra�unala ukoliko je potrebno. Ukoliko\n"
+#~ "ne znate ili niste sigurni �to unijeti, ostavite prazno."
+
+#~ 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 ""
+#~ "Sada mo�ete podesiti dial-up postavke. Ako niste sigurni �to treba\n"
+#~ "unijeti, raspitajte se kod svog ISP-a."
+
+#~ 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 ""
+#~ "Ako �elite koristiti proxye unesite ih sada. Ako niste sigurni\n"
+#~ "da li imate proxye raspitajte se kod mre�nog administratora ili ISP-a."
+
+#~ 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 ""
+#~ "Sada mo�ete instalirati kriptografske pakete ukoliko imate dobro pode�enu "
+#~ "internetu vezu.\n"
+#~ "Prvo morate odabrati mirror sa kojeg �e te skinuti pakete i\n"
+#~ "nakon toga izabrati pakete koje �elite izabrati.\n"
+#~ "\n"
+#~ "\n"
+#~ "Primjetite da morate izabrati mirror i kriptografske pakete prema va�em\n"
+#~ "zakonodavstvu."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "Sada mo�ete izabrati va�u vremensku zonu po tome gdje �ivite."
+
+#~ 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 ""
+#~ "Mo�ete podesiti lokalni pisa� (spojen na va�e ra�unalo) ili udaljeni\n"
+#~ "pisa� (dostupan preko Unix, Netware ili Microsoft Windows mre�e)."
+
+#~ 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 ""
+#~ "Ukoliko �elite biti u mogu�nosti ispisivati, molimo izaberite jedan od "
+#~ "ispisnih sustava izme�u\n"
+#~ "CUPS i LPR-a.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS je novi, mo�an i fleksibilan ispisni sustav za Unix sustave (CUPS\n"
+#~ "zna�i \"Common Unix Printing System\"). On je podrazumijevani ispisni "
+#~ "sustav u\n"
+#~ "Mandrake Linux-u.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR je stari ispisni sustav kori�ten u prija�njim Mandrake Linux "
+#~ "distribucijama.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko nemate pisa�, izaberite \"Niti jedan\"."
+
+#~ 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 mo�e raditi sa mnogim tipovima pisa�a. Svaki od njih zahtjeva\n"
+#~ "razli�ito postavljanje.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ako je va� pisa� fizi�ki povezan na va�e ra�unalo, izaberite \"Lokalni\n"
+#~ "pisa�\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko prisitupate pisa�u koji se nalazi na udaljenom Unix ra�unalu, "
+#~ "izaberite\n"
+#~ "\"Udaljeni pisa�\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ako �elite pristupiti pisa�u koji se nalazi na udaljenom Microsoft "
+#~ "Windows ra�unalu\n"
+#~ "(ili na Unix ra�unalu koje koristi SMB protokol), izaberite \"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 ""
+#~ "Molimo uklju�ite va� pisa� prije nego nastaviti kako bi dopustili DrakX-u "
+#~ "da ga prona�e.\n"
+#~ "\n"
+#~ "Trebate unijeti neke informacije ovdje.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Ime pisa�a: ispisni red koristi \"lp\" kao podrazumijevano ime "
+#~ "pisa�a. Zato, morate imati pisa� imenovan \"lp\".\n"
+#~ "     Ukoliko imate samo jedan pisa�, mo�ete mu dati nekoliko imena. Samo "
+#~ "ih trebate odvojiti sa cijev\n"
+#~ "     karakterom (\"|\"). Zato, ako preferirate neko bolje ime, morate ga "
+#~ "staviti prije, primjer: \"Moj printer|lp\".\n"
+#~ "     Pisa� koji ima \"lp\" u svom imenu biti �e podrazumijevani pisa�.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Opis: Ovo je opcionalno, ali mo�e biti korisno ukoliko imate "
+#~ "nekoliko pisa�a spojenih na va�e ra�unalo ili ako dozvoljavate\n"
+#~ "     drugim ra�unalim da pristupe ovom pisa�u.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Lokacija: ako �elite staviti neke informacije o va�em\n"
+#~ "     polo�aju pisa�a, stavite ju ovdje (slobodni ste napisati �to\n"
+#~ "     �elite. naprimjer \"2 kat\").\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 ""
+#~ "Trebate unijeti neke informacije ovdje.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Ime reda: ispisni red koristi \"lp\" kao podrazumijevano ime pisa�a. "
+#~ "Zato, trebate imati pisa� imenom \"lp\".\n"
+#~ "     Ako imate samo jedan pisa�, mo�ete koristiti nekoliko imena za "
+#~ "njega. Samo ih trebate odvojiti cijev\n"
+#~ "     karakterom (\"|\"). Zato, ako preferirate da imate neko bolje ime, "
+#~ "morate ga staviti prije, primjer: \"Moj printer|lp\".\n"
+#~ "     Pisa� koji ima \"lp\" u svom imenu �e biti podrazumijevani pisa�.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Veza pisa�a: Ukoliko je va� pisa� fizi�ki spojen na va�e ra�unalo, "
+#~ "izaberite \"Lokalni pisa�\".\n"
+#~ "     Ukoliko �elite pristupiti pisa�u koji se nalazi na udaljenom Unix "
+#~ "ra�unalu, izaberite \"Udaljeni lpd pisa�\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Ako �elite pristupiti pisa�u koji se nalazi na udaljenom Microsoft "
+#~ "Windows ralunalo (ili na Unix ra�unalu koji koristi SMB\n"
+#~ "     protokol), izaberite \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Ukoliko �elite pristupiti pisa�u koji se nalazi na NetWare mre�i, "
+#~ "izaberite \"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 ""
+#~ "Va� pisa� nije prona�en. Molimo unesite ime ure�aja na\n"
+#~ "koji je spojen.\n"
+#~ "\n"
+#~ "\n"
+#~ "Za informaciju, ve�ina pisa�a je spojena na prvi paralelni port. On\n"
+#~ "se zove \"/dev/lp0\" pod GNU/Linux-om i \"LPT1\" pod Microsoft Windows-"
+#~ "ima."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Sada morate izabrati va� pisa� u gornjem popisu."
+
+#~ 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 ""
+#~ "Molimo izaberite pravu opciju prema va�em pisa�u.\n"
+#~ "Molimo pogledajte njegovu dokumentaciju ako neznate �to izabrati ovdje.\n"
+#~ "\n"
+#~ "\n"
+#~ "Mo�i �ete testirati va�u konfiguraciju u slijede�em koraku i mo�i �ete ju "
+#~ "promjeniti ako ne radi kako �elite."
+
+#~ 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 ""
+#~ "Sada mo�ete unijeti root lozinku za va� Mandrake Linux sustav.\n"
+#~ "Lozinka mora biti unijeta dva puta kako bi provjerili da su obje unijete "
+#~ "lozinke identi�ne.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root je sustavski administrator i jedini je korisnik kojemu je dozvoljeno "
+#~ "mjenjanje \n"
+#~ "sustavske konfiguracije. Dakle, izaberite lozinku pa�ljivo. \n"
+#~ "Neautorizirano kori�tenje root ra�una mo�e biti jako opasno za "
+#~ "integritet\n"
+#~ "sustava, za njegove podatke i druge sustave koji su povezani s njim.\n"
+#~ "\n"
+#~ "\n"
+#~ "Lozinka bi trebala biti pomje�ana od alfanumeri�kih karaktera i mora "
+#~ "biti\n"
+#~ "najmanje 8 karaktera duga�ka. Nikada ne smije biti zapisana.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nemojte postaviti lozinku previ�e duga�ku ili kompliciranu, jer je se "
+#~ "morate mo�i \n"
+#~ "sjetiti bez previ�e napora."
+
+#~ 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 ""
+#~ "Ukoliko va�a mre�a koristi LDAP (ili NIS) protokol za autentifikaciju, "
+#~ "izaberite\n"
+#~ "\"LDAP\" (ili \"NIS\") kao autentifikaciju. Ukoliko ne znate, pitajte "
+#~ "va�eg mre�nog\n"
+#~ "administratora.\n"
+#~ "\n"
+#~ "Ukoliko va�e ra�unalo nije spojeno na nekakvu administriranu mre�u, mo�da "
+#~ "�elite \n"
+#~ "izabrati \"Lokalne datoteke\" za autentifikaciju."
+
+#~ 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 ""
+#~ "Sada mo�ete napraviri jedan ili vi�e \"regularnog\" korisni�kog ra�una, \n"
+#~ "suprotno od \"privilegiranog\" korisni�kog ra�una, root. Mo�ete "
+#~ "napraviti\n"
+#~ "jedan ili vi�e ra�una za svaku osobu kojoj �elite dozvoliti kori�tenje\n"
+#~ "ra�unala. Primjetite da �e svaki korisni�ki ra�una imati svoje vlastite\n"
+#~ "postavke (grafi�ko okru�je, postavke programa, itd.)\n"
+#~ "i svoj vlastiti \"ku�ni direktorij\", u kojem su te postavke\n"
+#~ "pohranjene.\n"
+#~ "\n"
+#~ "\n"
+#~ "Prije svega, napravite ra�un za sebe! Iako �ete biti samo jedan korisnik\n"
+#~ "ra�unala, ne smijete se prijavljivati kao root za dnevno kori�tenje "
+#~ "sustava: to je\n"
+#~ "jako velik sigurnosni rizik. Napraviti sustav nekorisnim je obi�no samo "
+#~ "tipku daleko.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dakle, trebali biste se prijaviti na sustav koriste�i korisni�ki ra�un\n"
+#~ "i kojega ste ovdje napravili, i prijaviti se kao root samo za "
+#~ "administriranje\n"
+#~ "i namjene odr�avanja."
+
+#~ 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 ""
+#~ "Pravljenje boot diskete je visoko preporu�eno. Ako ne mo�ete\n"
+#~ "podi�i va�e ra�unalo, to je jedini na�in za spa�avanje va�eg sustava bez\n"
+#~ "ponovnog instaliranja."
+
+#~ 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 i grub glavne opcije su:\n"
+#~ "  - Boot ure�aj: postavlja se ime ure�aja (npr. hard disk\n"
+#~ "particija) koja sadr�i boot sektor. Ukoliko neznate specifi�no,\n"
+#~ "izaberite \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Pauza prije podizanja podrazumijevane slike: Specifira broj destinke\n"
+#~ "sekunde koliko �e boot loader �ekati prije podizanja prve slike.\n"
+#~ "Ovo je korisno na sustavima na kojima se odmah podi�e sa hard diska "
+#~ "poslije\n"
+#~ "omogu�avanje tastature. Boot loader ne �eka ukoliko je \"pauza\" "
+#~ "izostavljena\n"
+#~ "ili postavljena na nulu.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video mod: ovo specifira VGA tekst mod koji �e biti odabran\n"
+#~ "prilikom podizanja. Slijede�e vrijednosti su raspolo�ive: \n"
+#~ "\n"
+#~ "    * normalno: izabire normalan 80x25 tekst mod.\n"
+#~ "\n"
+#~ "    * <broj>:  koristi odgovaraju�i tekst mod.  - Obri�i \"/tmp\" prvi "
+#~ "svakom podizanju: ukoliko �elite obrisati sve datoteke i direktorije\n"
+#~ "spremljene u \"/tmp\" kada podi�ete va� sustav, izaberite ovu opciju.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Precizan RAM ako je potrebno: na nesre�u, nema standardne metode za "
+#~ "pitati \n"
+#~ "BIOS o veli�ini RAM-a koji se nalazi u va�em ra�unalu. Kao posljedica, "
+#~ "Linux mo�e\n"
+#~ "pogre�no prona�i ispravnu veli�inu RAM-a. Ukoliko je to slu�aj, mo�ete\n"
+#~ "specifirati ispravnu veli�inu RAM-a ovdje.Molimo primjetite da je razlika "
+#~ "od 2 ili 4\n"
+#~ "MB izme�u prona�ene memorije i memorije koja se nalazi u va�em sustavu je "
+#~ "normalna."
+
+#~ 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 je bootloader za SPARC: on je u mogu�nosti podignuti\n"
+#~ "ili GNU/Linux ili bilo koji drugi postoje�i operativni sustav na va�em "
+#~ "ra�unalu.\n"
+#~ "Normalno, ti drugi operativni sustavi su ispravno detektirani i\n"
+#~ "instalirani. Ukoliko to nije slu�aj, mo�ete dodati unos ru�no na ovom\n"
+#~ "zaslonu. Budite pa�ljivi da izaberete ispravne parametre.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tako�er �ete mo�da po�eljeti nedati pristup tim drugim operativnim "
+#~ "sustavima\n"
+#~ "nikome, u tom slu�aju mo�ete obrisati odgovaraju�e unose. Ali\n"
+#~ "u tom slu�aju, trebati �ete boot disketu da bi ih podigli!"
+
+#~ 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 glavne opcije su:\n"
+#~ "  - Bootloader instalacija: Ozna�ava gdje �elite postaviti\n"
+#~ "zahtjevane informacije za podizanje GNU/Linux-a. Ukoliko ne znate to�no\n"
+#~ "�to radite, izaberite \"Prvi sektor diska (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Pauza prije bootiranja podrazumijevane slike: Specifira broj u "
+#~ "desetinkama\n"
+#~ "sekunde koliko �e boot loader �ekati prije nego podigne prvu sliku.\n"
+#~ "Ovo je korisno na sustavima na kojima se sustav podi�e odmah sa hard "
+#~ "diska poslije\n"
+#~ "omogu�ivanja tastature. Boot loader ne �eka ukoliko je \"pauza\"\n"
+#~ "izostavljena ili postavljena na nulu."
+
+#~ 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 ""
+#~ "Sada je vrijeme za konfiguriranje X Window Sustava, �to je\n"
+#~ "jezgra GNU/Linux GUI-a (Grafi�kog Korisni�kog Su�elja). Za ovu namjenu,\n"
+#~ "morate konfigurirati va�u video karticu i monitor. Ve�ina tih\n"
+#~ "koraka je automatizirano, dakle, va� rad se mo�e sastojati\n"
+#~ "od samog provjeravanja �to je ura�eno i prihva�anja postavki :)\n"
+#~ "\n"
+#~ "\n"
+#~ "Kada je konfiguracija zavr�ena, X-i �e biti pokrenuti (ako DrakX-u\n"
+#~ "niste rekli suprotno) tako da mo�ete provjeriti i vidjeti da li\n"
+#~ "vam postavke odgovaraju. Ukoliko ne, mo�ete do�i kasnije i\n"
+#~ "promjeniti ih, koliko god puta je potrebno."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Ukoliko je X pogre�no pode�en kori�tenjem ovih opcija mo�ete\n"
+#~ "ispravno podesiti X Window sustav."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Ukoliko preferirate grafi�ku prijavu odaberite \"Da\". U protivnom, "
+#~ "odaberite \"Ne\"."
+
+#~ 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 ""
+#~ "Mo�ete izabrati sigurnosnu razinu za va� sustav. Molimo pogledajte upute "
+#~ "za kompletnu\n"
+#~ "  informaciju. Jednostavno, ako ne znate �to izabrati, zadr�ite "
+#~ "postavljenu opciju.\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 ""
+#~ "Va� sustav �e sada rebootirati.\n"
+#~ "\n"
+#~ "Nakon reboot-a va� novi Mandrake Linux sustav �e se automatski u�itati.\n"
+#~ "Ukoliko �elite bootirati neki drugi postoje�i operativni sustav molim "
+#~ "pro�itajte\n"
+#~ "dodatne upute."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "�e�ka (Programerska)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slova�ka (Programerska)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Ime profila za napraviti:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Zapi�i u /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Vrati postavke iz datoteke"
+
+#~ msgid "Save in file"
+#~ msgstr "Spremi u datoteku"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Vrati postavke sa diskete"
+
+#~ msgid "Format all"
+#~ msgstr "Formatiraj sve"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Poslije formatiranja svih particija,"
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "svi podaci na ovim particijama biti �e izgubljeni"
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ msgid "Reload"
+#~ msgstr "Ponovo u�itaj"
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "Da li �elite generirati auto instalacijsku disketu za replikaciju linux-a?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL postavke"
+
+#~ 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 ""
+#~ "Sa udaljenim CUPS poslu�iteljem, ne morate konfigurirati\n"
+#~ "nijedan pisa� ovdje; pisa�i �e biti automatski detektirani\n"
+#~ "ukoliko nemate poslu�itelj na drugoj mre�i; u tom slu�aju,\n"
+#~ "morate dati IP adresu CUPS poslu�itelja i opciono broj porta."
+
+#~ msgid "Remote queue"
+#~ msgstr "Udaljeni red"
+
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Udaljeni red"
+
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "Ime domene"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Nema pisa�a"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "ograni�i"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Pra�enje mre�e"
+
+#~ msgid "Profile "
+#~ msgstr "Profil "
+
+#~ msgid "Statistics"
+#~ msgstr "Statistike"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "Brzina Slanja: "
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "Brzina Primanja: "
+
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "Tip veze: "
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Spajam se na Internet "
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Prekidam vezu na Internet "
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Prekidanje veze prema Internetu neuspje�no."
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Prekidanje veze prema Internetu zavr�eno."
+
+#~ msgid "Connection complete."
+#~ msgstr "Veza uspostavljena."
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "Veza neuspje�no uspostavljena.\n"
+#~ "Provjerite va�e postavke u Mandrake kontrolnom centru."
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "Postavke"
+
+#~ msgid "sent: "
+#~ msgstr "poslano: "
+
+#~ msgid "received: "
+#~ msgstr "primljeno: "
+
+#, fuzzy
+#~ msgid "average"
+#~ msgstr "sme�e"
+
+#~ msgid "Connect"
+#~ msgstr "Pove�i"
+
+#~ msgid "Disconnect"
+#~ msgstr "Odspoji"
+
+#~ msgid "/File/_New"
+#~ msgstr "/Datoteka/_Nova"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Datoteka/_Otvori"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Datoteka/_Spremi"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Datoteka/Spremi K_ao"
+
+#~ msgid "/File/-"
+#~ msgstr "/Datoteka/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Opcije"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Opcije/Test"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Pomo�"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/_Pomo�/_O programu..."
+
+#~ msgid "Default Runlevel"
+#~ msgstr "Uobi�ajena razina pokretanja"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Ukloni red"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Sadr�aj konfiguracijske datoteke ne mo�e biti interpretiran."
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Neprepoznata konfiguracijska datoteka"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minuta"
+#~ msgid "Adapter"
+#~ msgstr "Adapter"
 
-#~ msgid "1 minute"
-#~ msgstr "1 minuta"
+#, fuzzy
+#~ msgid "Disable network"
+#~ msgstr "Onemogu�i"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "Omogu�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 ""
+#~ "Sada mo�ete istestirati va�eg mi�a. Koristite tipke i kota�i� kako bi\n"
+#~ "provjerili da li su postavke dobre. Ukoliko nisu, kliknite na \"Odustani"
+#~ "\"\n"
+#~ "za odabir nekih drugih upravlja�kih programa."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (ili ADSL) veza"
+
+#~ msgid "Choose"
+#~ msgstr "Izaberite"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "Mo�ete specifirati direktno URI za pristup pisa�u sa CUPS-om."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Da, ispi�i ASCII probnu stranicu"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Da, ispi�i PostScript probnu stranicu"
+
+#~ msgid "Paper Size"
+#~ msgstr "Veli�ina papira"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Izbaci stranu poslije posla?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Postavke uniprinter pokreta�kog programa"
+
+#~ msgid "Color depth options"
+#~ msgstr "Opcije dubine boje"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sekundi"
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Ispi�i tekst kao PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Popravi stepenasti tekst?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Broj stranica po izlaznim stranicama"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Desna/lijeva margina u to�kama (1/72 in�a)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Gornja/donja margina u to�kama (1/72 in�a)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Dodatne GhostScript opcije"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Dodatne Tekst opcije"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Obrni redoslijed stranica"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS pokretanje"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Odaberite vezu udaljenog pisa�a"
+
+#~ 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 ""
+#~ "Svaki pisa� treba ime (naprimjer lp).\n"
+#~ "Drugi parametri kao opis pisa�a ili njegova lokacija\n"
+#~ "mo�e biti definirana. Koje ime �e biti kori�teno za ovaj pisa� i\n"
+#~ "kako je pisa� povezan?"
+
+#~ 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 ""
+#~ "Svaki ispisni red (gdje se �alju poslovi ispisa) treba\n"
+#~ "ime (�esto lp) i posredni�ki direktorij vezan uz njega. Koje\n"
+#~ "ime i direktorij �e se koristiti za ovaj red i kako je pisa� povezan?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Ime reda"
+
+#~ msgid "Spool directory"
+#~ msgstr "Posredni�ki direktorij"
+
+#~ msgid "Light configuration"
+#~ msgstr "Laka konfiguracija"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "Pru�ateljev DNS 1"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "Pru�ateljev DNS 2"
+
+#, fuzzy
+#~ msgid "fsck failed: "
+#~ msgstr "montiranje nije uspjelo:"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Ako �elite dodatnu sigurnost na sustavu odaberite \"Koristi shadow "
+#~ "datoteku\" i\n"
+#~ "\"Koristi MD5 lozinke\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Ukoliko va�a mre�a koristi NIS odaberite \"Koristi NIS\". Ako niste "
+#~ "sigurni\n"
+#~ "raspitajte se kod svog mre�nog administratora."
+
+#~ msgid "yellow pages"
+#~ msgstr "�ute stranice"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Kako se �elite spojiti na Internet?"
 
 #~ msgid "cannot fork: "
 #~ msgstr "ne mogu napraviti fork: "
@@ -8414,9 +10231,6 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 #~ msgid "Opening your connection..."
 #~ msgstr "Otvaram va�u vezu..."
 
-#~ msgid "Standard tools"
-#~ msgstr "Standardni alati"
-
 #~ msgid "Boot style configuration"
 #~ msgstr "Postava stila podizanja"
 
@@ -8556,9 +10370,6 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 #~ msgid "Internet/Network access"
 #~ msgstr "Internet/Mre�ni pristup"
 
-#~ msgid "Mail information"
-#~ msgstr "Mail informacije"
-
 #~ msgid "Miscellaneous questions"
 #~ msgstr "Razna pitanja"
 
@@ -8594,9 +10405,6 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 #~ "\n"
 #~ "Ukoliko �elite nastaviti, ugasiti �u va�e %s okru�je"
 
-#~ msgid "eth$_"
-#~ msgstr "eth$_"
-
 #~ msgid "Development, Database"
 #~ msgstr "Razvoj, Baze"
 
@@ -8625,9 +10433,6 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 #~ msgid "loopback"
 #~ msgstr "loopback"
 
-#~ msgid "None"
-#~ msgstr "Niti jedan"
-
 #~ msgid "Which bootloader(s) do you want to use?"
 #~ msgstr "Koji bootloader(e) �elite koristiti?"
 
@@ -8643,9 +10448,6 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 #~ msgid "Configure timezone"
 #~ msgstr "Podesi vremensku zonu"
 
-#~ msgid "Configure printer"
-#~ msgstr "Podesi pisa�"
-
 #~ msgid "Miscellaneous"
 #~ msgstr "Razno"
 
@@ -8724,18 +10526,12 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 #~ msgid "Update location"
 #~ msgstr "Osvje�i lokaciju"
 
-#~ msgid "Remove"
-#~ msgstr "Ukloni"
-
 #~ msgid "Find Package"
 #~ msgstr "Prona�i paket"
 
 #~ msgid "Find Package containing file"
 #~ msgstr "Prona�i paket koji sadr�i datoteku"
 
-#~ msgid "Uninstall"
-#~ msgstr "Deinstaliraj"
-
 #~ msgid "Choose package to install"
 #~ msgstr "Odaberite pakete za instaliranje"
 
@@ -8846,7 +10642,7 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 #~ "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"
@@ -9017,9 +10813,6 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 #~ msgid "nfs mount failed"
 #~ msgstr "nfs montiranje nije uspjelo"
 
-#~ msgid "CHAP"
-#~ msgstr "CHAP"
-
 #~ msgid "Cryptographic"
 #~ msgstr "Kriptografski"
 
@@ -9065,9 +10858,6 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 #~ msgid "Try to find %s devices?"
 #~ msgstr "Da li tra�im %s ure�aje?"
 
-#~ msgid "Modem Configuration"
-#~ msgstr "Postavke modema"
-
 #~ msgid "Try to find PCI devices?"
 #~ msgstr "Da li tra�im PCI ure�aje?"
 
@@ -9077,9 +10867,6 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 #~ msgid "%s: This is not a root partition, please select another one."
 #~ msgstr "%s: Ovo nije root particija, molim odaberite drugu."
 
-#~ msgid "No root partition found"
-#~ msgstr "Niti jedna root particija nije prona�ena"
-
 #~ msgid "Please choose a partition to use as your root partition."
 #~ msgstr ""
 #~ "Izaberite particiju koju �elite koristiti kao korijensku particiju (/)."
@@ -9155,6 +10942,3 @@ msgstr "Skup alata za mail, news, web, datote�ni prijenos, i razgovor"
 
 #~ msgid "useless"
 #~ msgstr "beskorisno"
-
-#~ msgid "garbage"
-#~ msgstr "sme�e"
diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index da9406094..89c5726ea 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -1,5 +1,6 @@
-# Translation file of Mandrake graphic install
+# Instal Grafis Mandrake
 # Copyright (C) 1999 Mandrakesoft
+# Budi Rachmanto <rac@linux-mandrake.com>, 2001
 # Linux Indonesia <http://www.linux.or.id>, 1999-2001
 # Mohammad DAMT <mdamt@cdl2000.com>, 1999-2001
 # Andy <chandy@indo.net.id>, 1999
@@ -7,34 +8,34 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: 2001-04-10 21:55+07:00\n"
-"Last-Translator: Mohammad DAMT <mdamt@mdamt.net>\n"
+"Project-Id-Version: DrakX 0.1\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-06-21 21:55+09:00\n"
+"Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Bahasa Indonesia <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "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 "Konfigurasikan semua monitor secara terpisah"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Gunakan ekstensi Xinerama"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Konfigurasikan kard ini sja \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Konfigurasi monitor lebih dari satu"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -42,33 +43,33 @@ msgstr ""
 "Sistem Anda mendukung penggunaan monitor lebih dari satu.\n"
 "Silakan pilih"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Card Grafik"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Pilih kartu grafis"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Pilih server X"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "Server 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 "Konfigurasi XFree mana yang Anda inginkan?"
 
-#: ../../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"
@@ -79,17 +80,18 @@ msgstr ""
 "Card Anda ini bisa digunakan pada XFree %s yang memiliki dukungan baik dalam "
 "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 "Card Anda dapat menggunakan akselerasi hardware 3D pada 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 dengan akselerasi hardware 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"
@@ -98,12 +100,12 @@ msgstr ""
 "Card Anda dapat menggunakan akselerasi hardware 3D pada XFree %s,\n"
 "NAMUN INI BARU DALAM TAHAP PERCOBAAN DAN DAPAT MEMBUAT KOMPUTER ANDA HANG."
 
-#: ../../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 dengan akselerasi hardware 3D PERCOBAAN"
 
-#: ../../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 +116,31 @@ msgstr ""
 "NAMUN INI BARU DALAM TAHAP PERCOBAAN DAN DAPAT MEMBUAT KOMPUTER ANDA HANG.\n"
 "Card Anda ini dapat digunakan XFree %s yang lebih baik dalam 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr "Xpmac (instalasi driver display)"
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "Konfigurasi XFree"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Pilih memori kartu grafis Anda"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
-msgstr "Pilih opsi untk server"
+msgstr "Pilih opsi server"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
-msgstr "Pilih jenis monitor anda"
+msgstr "Pilih 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"
@@ -156,39 +162,39 @@ msgstr ""
 "Anda akan rusak berat.\n"
 "Kalau Anda ragu, gunakan setting yang umum saja."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Laju refresh horisontal"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Laju refresh vertikal"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Monitor tidak dikonfigurasi"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Kartu grafis belum dikonfigurasi"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Resolusi belum ditentukan"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Anda ingin test konfigurasi ini?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Awas: testing ini bisa membuat card komputer Anda hang"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Test konfigurasi"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -196,152 +202,156 @@ msgstr ""
 "\n"
 "coba ubah beberapa parameter"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Ada error nih:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Cabut dalam %d detik"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Apa sudah sesuai settingnya?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Ada kesalahan, coba ubah beberapa parameter"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Resolusi"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Pilih resolusi dan kedalaman warna"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Card Grafik: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Server 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 Pakar"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Tunjukan seluruhnya"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Resolusi"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Layout Keyboard: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Jenis Mouse: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Device Mouse: %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 "HorizSync Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "VertRefresh Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Card Grafik: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Card Grafik: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Memori Grafik: %s KB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Pilihan kedalaman warna: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolusi: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Server XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "Driver XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Siap-siap konfigurasikan X "
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Apa yang akan anda mau?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Ubah Monitor"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Ubah kartu grafis"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Ubah Parameter Server"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Ubah Resolusi"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Lihat info"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Test lagi"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -354,26 +364,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
-msgstr "Silahkan masuk lagi ke %s untuk mengaktifkan perubahan"
+msgstr "Silakan masuk lagi ke %s untuk mengaktifkan perubahan"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "Silahkan log out dan tekan Ctrl-Alt-BackSpace"
+msgstr "Silakan log out dan tekan Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X saat startup"
 
-#: ../../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 ""
 "Saya bisa bikin komputermu akan menjalankan X saat booting.\n"
-"Kamu mau fasilitas ini ?"
+"Anda mau fasilitas ini ?"
 
 #: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
@@ -420,215 +430,223 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 mb atau lebih"
+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 atau lebih"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
-msgstr "standard VGA, 640x480 pada 60 Hz"
+msgstr "VGA Standar, 640x480 pada 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
-msgstr "Super VGA, 800x600 pada 56 Hz"
+msgstr "VGA Super, 800x600 pada 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 Kompatibel, 1024x768 pada 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 pada 87 Hz interlaced, 800x600 pada 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 pada 60 Hz, 640x480 pada 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 pada 60 Hz, 800x600 pada 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 pada 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 yang dapat mencapai 1280x1024 pada 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 yang dapat mencapai 1280x1024 pada 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 yang dapat mencapai 1280x1024 pada 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor yang dapat mencapai 1600x1200 pada 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor yang dapat mencapai 1600x1200 pada 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 "Sektor pertama di partisi boot"
 
-#: ../../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 "Sektor pertama di drive (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "Instalasi 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 "Bootloader akan diinstall di mana?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "Instalasi 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 dengan menu teks"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO dengan menu grafik"
 
-#: ../../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 "Boot dari DOS/Windows (loadlin)"
+msgstr "Boot dari 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 "Parameter Bootloader utama"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Bootloader yang hendak digunakan"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Instalasi Bootloader"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Device boot"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (tidak bisa dipakai pada BIOS kuno)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Compact"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "compact"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Mode video"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Delay sebelum boot ke image default"
 
-#: ../../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 "Password"
 
-#: ../../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 "Password (lagi)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Batasi parameter command line"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "batasi"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Hapus /tmp saat boot"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Ukuram RAM yg tepat (saya nemu %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Buat multi profil"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Berikan jumlah RAM dalam satuan MB"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Pilihan ``Batasi parameter command line'' tidak ada gunanya tanpa password"
 
-#: ../../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 "Silahkan ulangi"
+msgstr "Silakan ulangi"
 
-#: ../../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 "Password tidak sama"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Pesan Init"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Delay Open Firmware"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Timeout Kernel Boot"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Aktifkan boot dari CD?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Aktifkan boot dari OF?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Default 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."
@@ -636,146 +654,144 @@ msgstr ""
 "Ini adalah entri yang lain lagi.\n"
 "Anda boleh tambahkan atau mengubah yang sudah ada."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Tambah"
 
-#: ../../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 "Selesai"
 
-#: ../../any.pm_.c:220
-#, fuzzy
+#: ../../any.pm_.c:217
 msgid "Modify"
-msgstr "Ganti RAID"
+msgstr "Modifikasi"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Tipe entri mana yang hendak ditambahkan"
 
-#: ../../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 "OS Lain (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "OS Lain (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "OS Lain (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 "Sambung"
 
-#: ../../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 "Table"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Tidak aman"
 
-#: ../../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 "Label"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Default"
 
-#: ../../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 "Hapus entri"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Label tidak boleh kosong"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Label ini sudah dipakai"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Tipe partisi apa yang hendak digunakan?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Ketemu interface %s %s"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Anda punya lagi?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Punya %s interface?"
 
-#: ../../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 "Tidak"
 
-#: ../../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 "Ya"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Lihat info hardware"
 
 #. -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 "Menginstall driver untuk card %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 "Driver %s mana yang hendak saya coba?"
 
-#: ../../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,37 +806,37 @@ msgstr ""
 "walaupun kadangkala juga ini tidak perlu. Nah, apakah Anda ingin untuk\n"
 "memberikan parameter tambahan tadi atau biarkan saja drivernya melakukan\n"
 "deteksi sendiri parameternya? Biasanya, autodetek akan membuat kompputer\n"
-"jadi hengki (baca: hang), tapi biasanya sih nggak ngerusak hardwarenya."
+"jadi hengki (baca: hang), tapi biasanya sih tak ngerusak hardwarenya."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Probe otomatis"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Tuliskan optionnya"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Sekarang Anda boleh berikan parameter untuk module %s."
 
-#: ../../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 ""
-"Silahkan berikan parameter untuk modul %s ini.\n"
+"Silakan berikan parameter untuk modul %s ini.\n"
 "Parameter biasanya dalam format ``nama=nilai nama2=nilai2...''.\n"
 "Misalnya, ``io=0x300 irq=8''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Pilihan Module:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -829,33 +845,33 @@ msgstr ""
 "Module %s gagal diload.\n"
 "Mau coba lagi dengan parameter yang lain?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(Sudah ditambahkan %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Password ini terlalu sederhana"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
-msgstr "Silahkan tuliskan nama user"
+msgstr "Silakan tuliskan nama user"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Nama user hanya boleh terdiri dari huruf, angka, `-' dan `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "User ini sudah ada sebelumnya"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Tambah user"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -864,54 +880,67 @@ msgstr ""
 "Masukkan user\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Buat user"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Nama Lengkap"
 
-#: ../../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 "Nama user"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../../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 ""
 "Saya bisa bikin komputermu akan langsung login dengan suatu user.\n"
 "Kalau tidak ingin pakai fasilitas ini, tekan tombol Batal"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Pilih user default:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Pilih window manager yang hendak digunakan"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Pilih dulu bahasanya dong bow"
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "Anda bisa pilih bahasa lain yang akan tersedia setelah install selesai"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Semua"
+
 # 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"
@@ -936,54 +965,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 "Selamat datang di sang pemilih sistem operasi, 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 "Gunakan tombol %c dan %c untuk memilih entri yang disorot"
 
 #. -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 "Tekan enter untuk memboot OS yang terpilih, atau tekan 'e' untuk edit"
 
 #. -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 "perintah sebelum booting, atau 'c' untuk 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 "Entri yang dipilih akan diboot secara otomatis dalam %d detik."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
-msgstr "Waah /boot nggak cukup spacenya nih"
+msgstr "Waah /boot tak cukup spacenya nih"
 
 #. -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 "Bootloader akan diinstall di mana?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
-msgstr "wah belom ada help-nya nih.\n"
+msgstr " belom ada help-nya nih.\n"
 
 #: ../../bootlook.pm_.c:62
 msgid "Boot Style Configuration"
@@ -993,830 +1027,961 @@ msgstr "Konfigurasi Tipe Boot"
 msgid "/_File"
 msgstr "/_File"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/File/_Baru"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/File/_Buka"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/File/_Simpan"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/File/Simpan _Dengan nama lain"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/File/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/File/_Keluar"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Pilihan"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Pilihan/Test"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Help"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Help/_About..."
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Konfigurasikan"
-
-#: ../../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 ""
-"Selamat datang di utiliti Internet Connection Sharing!\n"
-"\n"
-"%s\n"
-"\n"
-"Silakan pencet Konfigurasikan untuk mulai."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "mode Lilo/Grub"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "Kategori Monitor Gaya Baru"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "Monitor GayaBaru"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "Monitor Biasa"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "Monitor Biasa Gtk+"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "Jalankan aurora saat boot"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "mode Lilo/Grub"
+
+#: ../../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 "Manajer Boot: %s. Klik Configure untuk memanggil pakar setup."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Konfigurasikan"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Mode boot"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "mode sistem"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "Jalankan X-Window saat sistem dimulai"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Tidak jack, saya tidak mau autologin"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Iya dong, saya mau pakai autologin (user,desktop)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "mode sistem"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Default"
-
-#: ../../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 "Batalkan"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "aduh, Ik ngga bisa baca file /etc/inittab nih: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "aduh, saya ngga bisa baca file /etc/sysconfig/autologin: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "aduh, Ik ngga bisa baca file /etc/inittab nih: %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 "Instalasi LILO gagal. Ada kesalahan berikut:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Buat"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Unmount"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Hapus"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Format"
+#: ../../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 "Ubah ukuran"
+#: ../../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 menit"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Posisi mount"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 menit"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Tulis /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d detik"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Berubah ke modus ahli"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Mohon untuk membackup data Anda dulu"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Berubah ke modus normal"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Baca dengan seksama!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Baca dari file"
+#: ../../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 ""
+"Kalau Anda mau pakai aboot, sisakan free space dulu (2048 sektor sih cukup "
+"deh)\n"
+"di awal disk"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Simpan di file"
+#: ../../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 "Ada Kesalahan"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Wizard"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Pulihkan dari floppy"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Baru"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Simpan di floppy"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Antrian remote"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Hapus semua"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Posisi mount"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Format semua"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Pilihan"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Pengalokasian otomatis"
+#: ../../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 "Semua partisi primary telah digunakan"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Unmount"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Aku tak bisa menambah partisi lagi"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Mount"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Pilih maunya apa"
 
-#: ../../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 ""
-"Untuk menambahkan partisi lagi, hapus satu agar dapat membuat partisiextended"
+"Anda punya satu partisi fat yang besar.\n"
+"(dipakai oleh Microsoft Dos/windows yah ?).\n"
+"Saya sarankan untuk meresize partisi ini\n"
+"(click di situ, dan pilih \"Ubah ukuran\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Tidak ada cukup ruangan untuk mengalokasikan partisi otomatis"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Silakan pilih partisinya"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Nggak Jadi (undo)"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Silakan pilih partisinya"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Tulis tabel partisi"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Silakan pilih partisinya"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Lagi"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detil"
 
-#: ../../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 "gagal melakukan mount"
+
+#: ../../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 "Kosong"
 
-#: ../../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 "Lainnya"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Tipe filesystem:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detil"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Buat"
+
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Gunakan ``%s'' saja"
+
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Hapus"
+
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Gunakan ``unmount'' terlebih dahulu"
 
-#: ../../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 ""
-"Anda punya satu partisi fat yang besar.\n"
-"(dipakai oleh Microsoft Dos/Windows yah ?).\n"
-"Saya sarankan untuk meresize partisi ini\n"
-"(click di situ, dan pilih \"Ubah ukuran\")"
+"Setelah mengganti tipe partisi %s, semua data pada partisi ini akan hilang"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Mohon untuk membackup data Anda dulu"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Mount device %s akan di mount ke mana?"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Baca dengan seksama!"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Pilihan Module:"
 
-#: ../../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 ""
-"Kalau Anda mau pakai aboot, sisakan free space dulu (2048 sektor sih cukup "
-"deh)\n"
-"di awal disk"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Hati-hati nih: operasi ini sangat berbuahayyya"
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "automounting media removable"
 
-#: ../../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 "Ada Kesalahan"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Mengubah tipe partisi"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Posisi mount: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Filesystem apa yang anda inginkan"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Device: "
+#: ../../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 letter: %s (hanya tebakan)\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 "Tipe: "
+#: ../../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 "Nama: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Server"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Mulai: 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 "Ukuran: %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 "Dari silinder %d sampai silinder %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Pilih maunya apa"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Telah diformat\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Membuat partisi baru"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Belum diformat\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Telah di-mount\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Berubah ke modus ahli"
 
-#: ../../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 "Berubah ke modus normal"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "File loopback: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Tak Jadi (undo)"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Partisi di-boot secara default\n"
-"    (untuk MS-DOS boot, bukan untuk lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Jalan terus?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Level %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Keluar tanpa menyimpan"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Ukuran chunk %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Keluar dari program tanpa menyimpan dalam tabel partisi?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "Disk RAID %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Anda ingin test konfigurasi ini?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Nama file loopback: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Pengalokasian otomatis"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Hapus semua"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Lagi"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Deteksi hard disk"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Tidak ada cukup ruangan untuk mengalokasikan partisi otomatis"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Semua partisi primary telah digunakan"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Aku tak bisa menambah partisi lagi"
+
+#: ../../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"
-"Mungkin partisi ini adalah \n"
-"partisi driver, jadi sebaiknya\n"
-"jangan diapa-apain deh.\n"
+"Untuk menambahkan partisi lagi, hapus satu agar dapat membuat partisiextended"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Tulis tabel partisi"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Selamatkan dulu tabel partisi"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Selamatkan dulu tabel partisi"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Selamatkan dulu tabel partisi"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "automounting media removable"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Pilih file"
+
+#: ../../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"
-"partisi ini adalah partisi bootstrap\n"
-"yang khusus digunakan \n"
-"oleh sistem dual boot.\n"
+"Backup tabel partisi tidak memiliki ukuran yg sama\n"
+"Jalan terus?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Silahkan pilih partisinya"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Awas"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Ukuran: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Maukkan disket di drive\n"
+"semua data pada disket ini akan hilang"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Ukuran: %s silinber, %s head, %s sektor\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Sedang mencoba menyelamatkan tabel partisi"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "Disk LVM %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Lihat info"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Partisi tipe: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Ubah ukuran"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "pada bus %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Pindah"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Mount"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Format"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Aktif"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Tambahkan ke RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Hapus dari RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Ganti RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Tambahkan ke LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Hapus dari RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Hapus dari LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Ganti RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "digunakan untuk loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Pilih maunya apa"
-
-#: ../../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 ""
-"Maaf, Saya tidak mau membuat /boot di drive ini (silindernya > 1024).\n"
-"Kalau Anda pakai LILO dan nggak jalan, atau Anda nggak mau LILO dan nggak "
-"mau /boot juga"
-
-#: ../../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 ""
-"Anda menambahkan partisi root diluar silinder 1024,\n"
-"dan anda tidak memiliki partisi /boot. Apabila anda akan menggunakan lilo\n"
-"(boot manager), hati-hati dalam menambahkan partisi /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 ""
-"Anda memilih partisi RAID software sebagai root (/).\n"
-"Sekarang bootloader nggak ada yang bisa handel tanpa partisi /boot.\n"
-"Jadi hati-hati yah untuk tambahkan partisi /boot"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Membuat partisi baru"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Gunakan ``%s'' saja"
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Sektor awal: "
 
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Gunakan ``unmount'' terlebih dahulu"
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Ukuran dalam MB: "
 
-#: ../../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 ""
-"Setelah mengganti tipe partisi %s, semua data pada partisi ini akan hilang"
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Tipe filesystem: "
 
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Cuek aja?"
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Posisi mount: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Keluar tanpa menyimpan"
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Seting:"
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Keluar dari program tanpa menyimpan dalam tabel partisi?"
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Sekarang sedang memformat file loopback %s"
 
-#: ../../diskdrake.pm_.c:516
+#: ../../diskdrake_interactive.pm_.c:486
 msgid "Change partition type"
-msgstr "Merubah tipe partisi"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Filesystem apa yang anda inginkan"
+msgstr "Mengubah tipe partisi"
 
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
-"Nggak bisa pakai ReiserFS buat partisi yang ukurannya lebih kecil dari 32 MB "
-"nih"
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr "Pindah dari ext2 ke ext3"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake_interactive.pm_.c:521
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Device loopback %s akan di mount ke mana?"
 
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Mount device %s akan di mount ke mana?"
-
-#: ../../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 ""
-"Nggak bisa unset mount point karena partisi ini sudah digunakan untuk\n"
+"Tak bisa unset mount point karena partisi ini sudah digunakan untuk\n"
 "loopback. Hapus dulu loopbacknya kalau mau begitu."
 
-#: ../../diskdrake.pm_.c:561
-#, c-format
-msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "Sehabis memformat partisi %s semua data pada partisi ini akan hilang"
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Sedang menghitung bound filesystem fat"
 
-#: ../../diskdrake.pm_.c:563
-msgid "Formatting"
-msgstr "sedang memformat"
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Sedang mengubah ukuran"
 
-#: ../../diskdrake.pm_.c:564
-#, c-format
-msgid "Formatting loopback file %s"
-msgstr "Sekarang sedang memformat file loopback %s"
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Ukuran partisi ini tidak dapat diubah"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Melakukan format partisi %s"
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "semua data pada partisi ini sebaiknya dibackup dulu"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Setelah melakukan format semua partisi,"
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr "Sehabis meresize partisi %s, semua data pada partisi ini akan hilang"
 
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "seluruh data dalam partisi-partisi ini akan hilang"
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Pilih ukuran baru"
 
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Pindah"
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Ukuran dalam MB: "
 
-#: ../../diskdrake.pm_.c:577
+#: ../../diskdrake_interactive.pm_.c:631
 msgid "Which disk do you want to move it to?"
 msgstr "Disk mana yang hendak dipindah?"
 
-#: ../../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 "Sektor mana yang hendak dipindah"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving"
 msgstr "Pindah"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving partition..."
 msgstr "Memindahkan partisi..."
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Pilih RAID yang ada untuk ditambahkan ke"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "baru"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Pilih LVM yang ada untuk ditambahkan ke"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "nama LVM?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Partisi ini tak bisa dipakai sebagai loopback"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Nama file loopback: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Nama Lengkap"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "File sudah digunakan loopback yang lain, pilih yang lainnya dong"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "File sudah ada. Gunakan file ini ?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "device"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "level"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "ukuran chunk"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Hati-hati nih: operasi ini sangat berbuahayyya"
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Tipe partisi apa yang hendak digunakan?"
+
+#: ../../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 ""
+"Maaf, Saya tidak mau membuat /boot di drive ini (silindernya > 1024).\n"
+"Kalau Anda pakai LILO dan tak jalan, atau Anda tak mau LILO dan tak mau /"
+"boot juga"
+
+#: ../../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 ""
+"Anda menambahkan partisi root diluar silinder 1024,\n"
+"dan anda tidak memiliki partisi /boot. Apabila anda akan menggunakan lilo\n"
+"(boot manager), hati-hati dalam menambahkan partisi /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 ""
+"Anda memilih partisi RAID software sebagai root (/).\n"
+"Sekarang bootloader tak ada yang bisa handel tanpa partisi /boot.\n"
+"Jadi hati-hati yah untuk tambahkan partisi /boot"
+
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Tabel partisi pada drive %s akan ditulis ke disk!"
 
-#: ../../diskdrake.pm_.c:594
+#: ../../diskdrake_interactive.pm_.c:868
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Anda harus reboot agar perubahan table partisi dapat berlaku"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Sedang menghitung bound filesystem fat"
+#: ../../diskdrake_interactive.pm_.c:879
+#, c-format
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr "Sehabis memformat partisi %s semua data pada partisi ini akan hilang"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Sedang merubah ukuran"
+#: ../../diskdrake_interactive.pm_.c:881
+msgid "Formatting"
+msgstr "sedang memformat"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Partisi ini tidak dapat dirubah ukurannya"
+#: ../../diskdrake_interactive.pm_.c:882
+#, c-format
+msgid "Formatting loopback file %s"
+msgstr "Sekarang sedang memformat file loopback %s"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "semua data pada partisi ini sebaiknya dibackup dulu"
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Melakukan format partisi %s"
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid gagal"
+
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Tidak ada cukup ruangan untuk mengalokasikan partisi baru"
+
+#: ../../diskdrake_interactive.pm_.c:895
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "Sehabis meresize partisi %s, semua data pada partisi ini akan hilang"
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Pilih ukuran baru"
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Tidak ada cukup ruangan untuk mengalokasikan partisi baru"
 
-#: ../../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 "Membuat partisi baru"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Resolusi: %s\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Sektor awal: "
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Device: "
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Ukuran dalam MB: "
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS letter: %s (hanya tebakan)\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Tipe filesystem: "
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Tipe: "
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Seting:"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Nama: "
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "Partisi ini nggak bisa dipakai sebagai loopback"
+#: ../../diskdrake_interactive.pm_.c:954
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "Mulai: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Loopback"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Ukuran: %s"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Nama file loopback: "
+#: ../../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 "File sudah digunakan loopback yang lain, pilih yang lainnya dong"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Dari silinder %d sampai silinder %d\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "File sudah ada. Gunakan file ini ?"
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Telah diformat\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Pilih file"
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Belum diformat\n"
 
-#: ../../diskdrake.pm_.c:876
-msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
-msgstr ""
-"Backup tabel partisi tidak memiliki ukuran yg sama\n"
-"Cuek saja?"
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Telah di-mount\n"
 
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Awas"
+#: ../../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 "File loopback: %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
-"Maukkan disket di drive\n"
-"semua data pada disket ini akan hilang"
+"Partisi di-boot secara default\n"
+"    (untuk MS-DOS boot, bukan untuk lilo)\n"
 
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Sedang mencoba menyelamatkan tabel partisi"
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Level %s\n"
 
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "device"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Ukuran chunk %s\n"
 
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "level"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "Disk RAID %s\n"
 
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "ukuran chunk"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Nama file loopback: %s"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Pilih RAID yang ada untuk ditambahkan ke"
+#: ../../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"
+"Mungkin partisi ini adalah \n"
+"partisi driver, jadi sebaiknya\n"
+"jangan diapa-apain deh.\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "baru"
+#: ../../diskdrake_interactive.pm_.c:978
+msgid ""
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
+msgstr ""
+"\n"
+"partisi ini adalah partisi bootstrap\n"
+"yang khusus digunakan \n"
+"oleh sistem dual boot.\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Pilih LVM yang ada untuk ditambahkan ke"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Ukuran: %s\n"
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "nama LVM?"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Ukuran: %s silinber, %s head, %s sektor\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "automounting media removable"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info: "
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Selamatkan dulu tabel partisi"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "Disk LVM %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Partisi tipe: %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "pada bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Reload"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Pilihan: %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 proses format dari %s gagal"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "tidak bisa melakukan format %s dengan tipe %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "gagal melakukan mount"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr "fsck gagal dg kode keluar %d / sinyal %d"
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "gagal melakukan mount: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "error melakukan unmount %s: %s"
@@ -1829,41 +1994,42 @@ msgstr "simple"
 msgid "server"
 msgstr "server"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Tak dapat pakai JFS utk partisi berukuran di bawah 16MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Tak dapat pakai ReiserFS utk partisi berukuran di bawah 32MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Mount point harus diawali dengan /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Partisi dengan mount poin %s sudah ada\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Mount melingkar %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 "Anda tidak bisa menggunakan LVM Logical Volume untuk titik mount %s."
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Direktori ini harus ada di filesystem root"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
-msgstr ""
-"Kamu harus punya filesystem sungguhan (ext2 atau reiserfs) untuk memount "
-"ini\n"
+msgstr "Anda perlu filesystem yg benar (ext2, reiserfs) utk titik mount ini\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "error membuka file %s untuk ditulisi: %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"
@@ -1871,740 +2037,752 @@ msgstr ""
 "Error - tidak ada device yang valid untuk membuat filesystem baru.Periksa "
 "kembali hardware untuk mencari penyebabnya"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
-msgstr "Kok belum punya partisi ?"
-
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "Pilihlan bahasa yang ingin Anda gunakan untuk instalasi dan sistem."
-
-#: ../../help.pm_.c:12
+msgstr "Anda tak punya partisi!"
+
+#: ../../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 ""
-"Anda harus menerima ketentuan dalam lisensi di atas untuk melanjutkan proses "
-"instalasi.\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"
-"Silahkan tekan \"Baiklah\" bila Anda setuju dengan persyaratan di atas.\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"
-"dan silakan tekan \"Tidak Mau\" bila Anda tidak setuju. Proses instalasi "
-"akan dihentikan tanpa merubah konfigurasi yang sudah ada."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Pilih layout keyboard yg dipakai dari daftar di atas"
-
-#: ../../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 ""
-"Bila Anda menginginkan bahasa-bahasa lain selain bahasa yang Anda tadi pilih "
-"pada saat setelah instalasi, silahkan pilih pada daftar di atas. Bila Anda "
-"mau semuanya, pilih saja \"Semuanya\"."
-
-#: ../../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 ""
+"Di atas telah terdaftar partisi Linux yang sudah ada yang saya deteksi pada "
+"hard drive Anda. Anda dapat tetap menggunakannya nanti. Bila Anda mengubah "
+"pilihan ini, Anda paling tidak perlu memberikan lokasi partisi root\n"
+"(\"/\"). Jangan pilih partisi yang terlalu kecil agar bisa menginstall "
+"software dengan leluasa. Bila Anda ingin\n"
+"menyimpan data pada partisi lain, Anda perlu memilih partisi \"/home"
+"\" (Hanya bisa dibuat bila punya lebih\n"
+"dari satu partisi Linux.)\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
 "\n"
+"Sebagai Informasi, tiap-tiap partisi terdaftar dengan cara berikut: \"Nama"
+"\", \"Kapasitas\".\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"
+"\"Nama\" dituliskan dalam bentuk kode sebagai berikut: \"tipe hard drive\","
+"\"nomor hard drive\",\n"
+"\"nomor partisi\" (misalnya \"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"
+"\"Tipe hard drive\" adalah \"hd\" bila drive tersebut bertipe IDE dan "
+"bernilai \"sd\"\n"
+"bila berupa drive 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 ""
-"Silakan pilih \"Install\" bila sekarang Anda belum pernah menginstall Linux "
-"Mandrake di komputer ini\n"
-"atau bila Anda ingin menginstall banyak sistem operasi.\n"
+"\"Nomor Hard Drive\", selalu berupa huruf setelah \"hd\" atau \"sd\". Bila "
+"berupa IDE,\n"
+"maka:\n"
 "\n"
+"   *\"a\" berarti \"hard drive master pada kontroller IDE primer\",\n"
 "\n"
-"Silakan pilih \"Update\" bila Anda ingin melakukan update pada sistem Linux "
-"Mandrake yang sudah ada\n"
+"   *\"b\" berarti \"hard drive slave pada kontroler IDE primer\",\n"
 "\n"
+"   *\"c\" berarti \"hard drive master pada kontroler IDE sekunder\",\n"
 "\n"
-"Silakan Anda pilih tingkatan install atau update bergantung dengan "
-"pengetahuan Anda di bidang GNU/Linux:\n"
+"   *\"d\" berarti \"hard drive slave pada kontroler IDE sekunder\",\n"
 "\n"
-"\t* Disarankan: pilih ini bila Anda belum pernah menginstall sistem operasi "
-"GNU/Linux\n"
-".\t proses instalasi akan sangat mudah dan Anda hanya ditanya beberapa "
-"pertanyaan saja.\n"
 "\n"
+"Pada drive SCSI, \"a\" berarti \"hard drive utama, \"b\" berarti \"hard "
+"drive kedua\", dsb..."
+
+#: ../../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* Custom: pilih ini bila Anda cukup familiar dengan GNU/Linux, dan Anda "
-"bisa membuat sistem Anda\n"
-"\tmenjadi sesuai kebutuhan Anda (workstation, server, atau development). "
-"Anda akan ditanyakan pertanyaan\n"
-"\tyang lebih banyak lagi dari instalasi \"Disarankan\". Jadi Anda perlu "
-"lebih jauh lagi mengenal dunia\n"
-"GNU/Linux bila memilih kelas instalasi ini\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* Pakar: pilih ini bila Anda memiliki pengetahuan yang luas di bidang GNU/"
-"Linux,\n"
-"\t sebagaimana di kelas \"Custom\", Anda akan dapat menentukan penggunaan "
-"utama\n"
-"\t sistem ini (workstation, server, atau development). Hati-hatilah bila "
-"memilih kelas ini\n"
-"\t karena Anda akan dapat melakukan instalasi yang bebas\n"
-"\t Anda akan kesulitan menjawab pertanyaan yang diajukan bila Anda tidak "
-"memiliki\n"
-"\t pengetahuan GNU/Linux yang kuat. Jadi jangan pilih kelas ini kecuali "
-"Anda\n"
-"\t tahu apa yang Anda lakukan."
-
-#: ../../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 ""
-"Pilih:\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"
-"  - Customized:  Bila Anda familiar dengan Linux, Anda akan dapat\n"
-" memilih penggunaan sistem ini, yaitu normal, development, atau server.\n"
-" Pilih \"Normal\" untuk instalasi secara umum yang biasanya. Atau pilih\n"
-" \"Development\" untuk membuat software dengan Linux Anda, atau pilih\n"
-" \"Server\" bila hendak menginstall server serbaguna (mail, print, dsb)\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"
-"  - Pakar    :  Bila Anda sangat dekat dengan GNU/Linux dan ingin\n"
-" menginstall Linux sesuka hati, ini adalah kelas instalasi yang pas\n"
-" untuk kamu, dan kamu bisa memilih penggunaan sistem ini sebagaimana\n"
-" pada kelas \"Customized\". JANGAN COBA-COBA PAKAI MODUS INI KALAO\n"
-" belom cukup makan asam garam di dunia PERLINUXAN"
+"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 ""
-"Berikut adalah pilihan penggunaan mesin Anda :\n"
-"\n"
-"\t*Workstation: pilih ini kalau Anda hendak menggunakan mesin Anda untuk "
-"mengerjakan\n"
-"\t pekerjaan sehari-hari di kantor atau di rumah\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* Development: pilih ini bila Anda hendak menggunakan mesin ini untuk "
-"pembuatan software.\n"
-"\t Anda akan saya kasih kumpulan software yang berguna untuk melakukan "
-"kompilasi,\n"
-"\t debug, dan format source code, atau untuk membuat paket software\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 : Pilih ini bila Anda hendak menggunakan mesin ini sebagai\n"
-"\t server. Entah itu file server (NFS ataw SMB), print server\n"
-"\t (pakai protokol Unix lp (Line Printer) atau model Windows SMB)\n"
-"\t authentication server (NIS), database server dsb dsb.\n"
-"\t Karena itu jangan mengharapken saya menyediakan rupa-rupa\n"
-"\t software yang ngejreng (KDE,GNOME...) di sini."
+"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 ""
+"Anda boleh pilih service mana aja yang mau dijalankan saat boot.\n"
+"Anda bisa lihat keterangan servicenya pada baloon help kecil yang akan "
+"muncul\n"
+"kalau Anda geserkan mousenya ke atas nama servicenya.\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"
+"Hati-hati pilihnya ya, apalagi kalau mau pakai sistem ini sebagai server\n"
+"jangan sembarang nyalakan service yang tak perlu. Mohon diingat\n"
+"bahwa ada service yang berbahaya bila dinyalakan pada server\n"
+"Pokoknya, pilih saja service yang Anda anggap penting."
+
+#: ../../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 mengatur jam dengan GMT atawa \"Greenwich Mean Time\" dan \n"
+"menterjemahkannya ke waktu lokal sesuai dengan timezone yang Anda pilih."
+
+#: ../../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"
-"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 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 ""
-"DrakX akan coba cari adapter SCSI PCI.\n"
-"Kalau DrakX menemukan adapter SCSI dan punya drivernya, maka\n"
-"drivernya akan secara otomatis diinstalkan.\n"
+
+#: ../../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"
-"Bila Anda tidak punya adapter SCSI, SCSI ISA, atau SCSI PCI yang\n"
-"DrakX nggak punya drivernya, maka DrakX akan konfirmasi lagi.\n"
-"Bila memang nggak ada adapternya, klik aja 'Nggak'. Bila klik 'Ya'\n"
-"maka daftar driver akan ditampilkan, dan ente silahkan pilih.\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"
+" * 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"
-"Kalau Anda ingin menentukan sendiri adapternya, DrakX akan \n"
-"menanyakan apakah ada option lagi. Anda harus perbolehkan DrakX\n"
-"mendeteksi hardwarenya. Biasanya sih bisa kalau begini.\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"
-"Kalau Anda tidak mau, Anda bisa coba kasih optionnya\n"
-"Coba baca Buku Petunjuk (bab 3, bagian: \"Collective Informations on your "
-"hardware\") untuk trik mendapatkan informasi\n"
-"ini dari Windows (itu juga kalau Anda install yaaa),\n"
-"dari dokumentasi hardware, atau dari website pabriknya\n"
-"(kalau ada akses ke Internet)."
+"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:108
+#: ../../help.pm_.c:255
+#, fuzzy
 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"
+"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 "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\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 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"
-"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 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"
-"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"
+" * \"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"
-"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"
+" * \"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* 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"
+" * \"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"
-"\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."
-msgstr ""
-"Pada tahap ini, silakan pilih tempat di mana Linux Mandrake akan "
-"diinstallkan pada hard drive Anda.\n"
-"Bila hard drivenya masih kosong atau ada sistem operasi lain yang mengisi "
-"seluruhnya, Anda perlu\n"
-"melakukan proses partisi. Pada dasarnya, proses partisi hard drive adalah "
-"membagi-bagi hard drive\n"
-"secara logika untuk membuat ruangan kosong untuk diinstallkan sistem Linux "
-"Mandrake.\n"
-"\n"
-"\n"
-"Karena proses ini bersifat satu arah (tidak dapat dikembalikan ke partisi "
-"semula), proses partisi dapat \n"
-"membuat stress dan pusing kepala, apalagi bila Anda adalah user yang belum "
-"berpengalaman.\n"
-"Sekarang saya akan mempermudah proses ini. Sebelum kita mulai, silakan baca-"
-"baca dulu buku\n"
-"manual dan pelajari dulu dengan baik.\n"
-"\n"
-"\n"
-"Anda membutuhkan sedikitnya dua buah partisi. Satu digunakan untuk sistem "
-"operasi itu sendiri dan\n"
-"satu lagi digunakan untuk virtual memory (juga dikenal dengan istilah "
-"Swap).\n"
-"\n"
-"\n"
-"Bila partisi-partisi tersebut sudah ada sebelumnya (dari hasil install "
-"sebelumnya atau dibuat oleh\n"
-"program partisi lain), Anda dapat memilih partisi-partisi tersebut untuk "
-"digunakan sebagai tempat\n"
-"menginstall sistem Linux ini.\n"
-"\n"
-"\n"
-"Bila ternyata belum ada, Anda harus membuatnya dong. Caranya, gunakan "
-"program wizard di atas\n"
-"Ada beberapa cara yang dapat Anda gunakan yang bergantung pada konfigurasi "
-"hard drive yang\n"
-"Anda gunakan:\n"
-"\n"
-"\t* Gunakan partisi yang ada: wizard mendeteksi satu atau lebih partisi "
-"Linux di hard drive ini. Bila\n"
-"Anda ingin tetap menggunakannya, pilihlah pilihan ini.\n"
-"\n"
-"\n"
-"\t* Hapus seluruh disk: Pilihlah ini bila Anda ingin menghapus seluruh data "
-"dan partisi yang ada\n"
-"di hard drive Anda untuk kemudian digantikan semuanya dengan sistem Linux "
-"Mandrake. Namun\n"
-"berhati-hatilah karena Anda tidak dapat mengembalikan semuanya ke dalam "
-"kondisi semula.\n"
-"\n"
-"\n"
-"\t* Gunakan ruangan kosong di partisi Windows: Pilih ini bila Anda memiliki "
-"Microsoft Windows\n"
-"yang juga diinstall di hard drive ini yang menggunakan seluruh kapasitas "
-"drive. Caranya\n"
-"Anda perlu membuat ruangan kosong untuk data Linux dengan menghapus partisi "
-"dan data\n"
-"Microsoft Windows (silakan baca: \"Hapus seluruh disk\" atau solusi mode "
-"\"Pakar\") atau\n"
-"bisa juga merubah ukuran partisi Microsoft Windowsnya. Cara ini dapat "
-"digunakan tanpa harus\n"
-"kehilangan data. Cara ini disarankan bila Anda ingin menggunakan Linux "
-"Mandrake dan \n"
-"Microsoft Windows dalam satu komputer.\n"
-"\n"
-"\n"
-"\t* Sebelum memilih cara ini, mohon agar diketahui bahwa partisi Microsoft "
-"Windows yang Anda lihat\n"
-"sekarang ukurannya lebih kecil. Artinya, Anda akan memiliki ruangan yang "
-"lebih kecil dalam\n"
-"Microsoft Windows untuk menyimpan data atau untuk menginstall software "
-"baru.\n"
-"\n"
-"\n"
-"\t* Mode pakar: pilih ini bila Anda ingin secara manual mempartisi hard "
-"drive Anda. Hati-hati\n"
-"dalam memilih mode ini. Cara ini sangat powerful namun juga berbahaya. Anda "
-"bisa kehilangan\n"
-"data dengan mudah. Jadi jangan main-main dengan pilihan ini."
-
-#: ../../help.pm_.c:160
-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"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
+"\n"
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
+msgstr ""
+"Pada tahap ini, pilihlah tempat Linux Mandrake akan diinstal di harddisk.\n"
+"Bila harddisk masih kosong / ada sistem operasi lain yg mengisi seluruhnya,\n"
+"Anda perlu melakukan proses partisi. Pada dasarnya, proses partisi harddisk\n"
+"adalah membagi harddisk secara logika, dg membuat ruang kosong utk "
+"instalasi\n"
+"sistem Linux Mandrake.\n"
 "\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
 "\n"
+"Karena bersifat satu arah (tak dapat dikembalikan ke partisi awal), proses\n"
+"partisi dapat membuat stres dan pusing kepala, apalagi jika Anda belum\n"
+"berpengalaman. Kini saya akan mempermudah proses ini.\n"
+"Sebelum dimulai, baca dan pelajari dulu buku manual dengan baik.\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"
+"Anda perlu sedikitnya dua partisi. Satu utk sistem operasi itu sendiri dan\n"
+"satu lagi utk virtual memory (juga dikenal dengan istilah Swap).\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"
+"Bila partisi-partisi tersebut sudah ada sebelumnya (hasil instal "
+"sebelumnya/\n"
+"dibuat oleh program partisi lain), Anda bisa memilih partisi-partisi tsb "
+"utk\n"
+"digunakan sbg tempat instalasi sistem Linux ini.\n"
 "\n"
-"   * Undo: you can use this option to cancel your changes.\n"
 "\n"
+"Jika belum ada, Anda harus membuatnya. Gunakan program wizard di atas. Ada\n"
+"bbrp cara yg dapat Anda gunakan tergantung konfigurasi harddisk yg Anda\n"
+"pakai:\n"
 "\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
+"* Gunakan partisi yang ada: wizard mendeteksi satu/lebih partisi Linux di\n"
+" harddisk ini. Bila Anda ingin tetap menggunakannya, pilihlah ini.\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"
+"* Hapus seluruh disk: Pilih ini bila Anda ingin hapus semua data dan\n"
+" partisi di harddisk Anda utk kemudian digantikan semuanya oleh sistem\n"
+" Linux Mandrake. Hati-hati, Anda tak dapat kembali setelah konfirmasi.\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"
+"* Gunakan ruang kosong di partisi windows: bila wicrosoft mindows\n"
+" terinstal dan memakan seluruh kapasitas disk, Anda perlu membuat ruang\n"
+" kosong untuk data Linux dg menghapus partisi dan data wicrosoft mindows\n"
+" (silakan baca \"Hapus seluruh disk\" atau solusi mode \"Pakar\") atau\n"
+" bisa juga mengubah ukuran partisi wicrosoft mindows. Cara ini dapat\n"
+" digunakan tanpa harus kehilangan data. Cara ini disarankan bila Anda\n"
+" ingin memakai Linux Mandrake dan wicrosoft mindows dlm satu komputer.\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"
+" Sebelum memilih cara ini, mohon maklum bahwa partisi wicrosoft mindows\n"
+" sekarang ukurannya lebih kecil. Artinya, ruang dlm wicrosoft mindows utk\n"
+" menyimpan data / menginstall software baru menjadi kecil.\n"
 "\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
+"* Mode pakar: pilih bila Anda ingin secara manual mempartisi harddisk.\n"
+" Awas! Cara ini amat perkasa tapi juga berbahaya. Anda bisa kehilangan\n"
+" data dg mudah. Jangan pilih kecuali Anda tahu yg Anda lakukan."
+
+#: ../../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"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\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"
-"When a partition is selected, you can use:\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
 "\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
-"           * Ctrl-d to delete a partition\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"
-"           * Ctrl-m to set the mount point\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"
-"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 ""
-"Pada tahap ini, Anda harus memilih partisi mana yang hendak digunakan untuk "
-"menginstall sistem Linux\n"
-"Mandrake. Bila partisinya sudah dibuat (dengan menggunakan instalasi GNU/"
-"Linux sebelumnya atau dengan\n"
-"program partisi lain), Anda dapat menggunakan partisi-partisi tersebut, bila "
-"belum Anda maka kita perlu buat\n"
-"terlebih dahulu.\n"
+
+#: ../../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"
-"Untuk membuat partisi, pertama kali Anda perlu memilih hard drive dulu. Anda "
-"kemudian dapat memilih disk\n"
-"untuk dipartisi dengan mengklik \"hda\" bila hard drivenya adalah drive IDE "
-"pertama, \"hdb\" bila drive itu adalah\n"
-"drive IDE kedua, atau \"sda\" bila drive itu adalah drive SCSI pertama dan "
-"seterusnya.\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"
-"Untuk mempartisi hard drive, Anda bisa gunakan pilihan berikut:\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
-"   * Hapus semua: pilihan ini menghgapus semua partisi yang ada pada hard "
-"drive yang dipilih.\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 ""
+"Tiap-tiap partisi yang telah dibuat perlu diformat agar dapat digunakan\n"
+"(format berarti membuat filesystem).\n"
 "\n"
-"   * Alokasi otomatis: pilihan ini untuk mengkonfigurasi otomatis dalam "
-"pembuatan partisi swap dan Ext2\n"
-"pada ruangan kosong di hard drive.\n"
 "\n"
+"Sekarang Anda bisa mem-format ulang partisi yg ada utk dihapus datanya.\n"
+"BIla ini hendak Anda lakukan, pilih dulu partisi yang hendak diformat.\n"
 "\n"
-"   * Selamatkan tabel partisi: Bila tabel partisi Anda rusak, Anda bisa "
-"mencoba mengembalikannya\n"
-"dengan cara ini. Hati-hatilah dan ingat lah akan resiko kegagalan.\n"
 "\n"
+"Ingat, Anda tak perlu melakukan format ulang ini pada semua partisi yg ada.\n"
+"Anda perlu mem-format ulang partisi yg akan diisi sistem operasi (misalnya\n"
+"pada partisi \"/\", \"./usr\", atau \"/var\"), tapi tak perlu melakukannya\n"
+"pada partisi berisi data yang masih akan digunakan (misalnya \"/home\").\n"
 "\n"
-"   * Nggak jadi: Anda bisa gunakan ini untuk membatalkan aksi ini\n"
 "\n"
+"Hati-hati dalam memilih partisi. Setelah diformat semua data akan hilang "
+"dan\n"
+"tak dapat dikembalikan ke kondisi semula.\n"
 "\n"
-"   * Reload: Anda bisa gunakan pilihan ini untuk membatalkan partisi dan "
-"mengembalikan\n"
-"tabel partisi semula.\n"
 "\n"
+"Pilihlah \"OK\" untuk melakukan format partisi\n"
 "\n"
-"   * Wizard: Bila Anda ingin menggunakan wizard untuk mempartisi hard drive, "
-"pilih ini saja.\n"
-"Cara ini disarankan bila Anda tidak mengetahui tentang partisi.\n"
 "\n"
+"Klik \"Batal\" untuk memilih partisi lain guna instalasi Linux Mandrake."
+
+#: ../../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 dari Disket: Bila Anda pernah menyimpan partisi ke disket, Anda "
-"bisa kembalikan\n"
-"menjadi semula dengan cara ini.\n"
+"Please be patient."
+msgstr ""
+"Sistem operasi Linux Mandrake Anda yang baru sedang di-instal.\n"
+"Proses ini memakan waktu beberapa menit (tergantung ukuran yang\n"
+"Anda install dan kecepatan komputer Anda).\n"
 "\n"
 "\n"
-"   * Simpan ke disket: Pilih ini bila Anda hendak menyimpan tabel partisi "
-"pada disket untuk\n"
-"dijadikan simpanan untuk di kemudian hari. Saya sangat menyarankan Anda "
-"untuk melakukan hal ini.\n"
+"Sabar..."
+
+#: ../../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"
-"   * Selesai: pilih ini bila Anda sudah selesai mempartisi hard drive dan "
-"ingin menyimpannya.\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"
-"Sebagai informasi, Anda bisa mengakses pilihan-pilihan di atas dengan "
-"menggunakan keyboard saja,\n"
-"piihlah partisi dengan tombol Tab dan panah Atas/Bawah.\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"
-"Saat partisi dipilih, Anda bisa gunakan:\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"
-"         * Ctrl C untuk membuat partisi baru pada partiisi yang masih "
-"kosong\n"
-"         * Ctrl D untuk menghapus partisi\n"
-"         * Ctrl M untuk menset titik mount\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"
-"Bila Anda menginstall pada komputer PPC, Anda perlu membuat partisi "
-"bootstrap HFS kecilsebesar paling tidak 1 MB untuk\n"
-"digunakan oleh bootloader yaboot. Bila Anda ingin membuat partisi itu lebih "
-"besar lagi,misalnya 50 MB, Anda bisa menggunakannya untuk menyimpan\n"
-"kernel cadangan dan image ramdisk untuk situasi boot darurat."
-
-#: ../../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"
+" * \"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"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\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"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\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"
-"\"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"
+" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
 "\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
-"hard drives:\n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"   * \"a\" means \"master hard drive on the primary IDE controller\",\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 ""
+"Pada tahap ini, Anda harus memilih partisi yg hendak dipakai utk instalasi\n"
+"sistem Linux Mandrake. Bila partisi sudah dibuat (dg instalasi GNU/Linux\n"
+"sebelumnya/dg program partisi lain), Anda bisa memakai partisi-partisi tsb.\n"
+"Jika belum ada, buat terlebih dahulu.\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"
+"Utk membuat partisi, pertama pilihlah harddisk. Anda dapat memilih disk utk\n"
+"dipartisi dg mengklik \"hda\" utk harddisk IDE pertama, \"hdb\" utk disk "
+"IDE\n"
+"kedua, atau \"sda\" bila drive itu adalah drive SCSI pertama dst.\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
+"Untuk mempartisi harddisk, gunakan pilihan berikut:\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
-msgstr ""
-"Di atas telah terdaftar partisi Linux yang sudah ada yang saya deteksi pada "
-"hard drive Anda. Anda dapat tetapmenggunakannya nanti. Bila Anda merubah "
-"pilihan ini, Anda paling tidak perlu memberikan lokasi partisi root\n"
-"(\"/\"). Jangan pilih partisi yang terlalu kecil agar bisa menginstall "
-"software dengan leluasa. Bila Anda ingin\n"
-"menyimpan data pada partisi lain, Anda perlu memilih partisi \"/home"
-"\" (Hanya bisa dibuat bila punya lebih\n"
-"dari satu partisi Linux.)\n"
+"   * Hapus semua: pilihan ini menghapus semua partisi pada harddisk "
+"terpilih\n"
 "\n"
 "\n"
-"Sebagai Informasi, tiap-tiap partisi terdaftar dengan cara berikut: \"Nama"
-"\", \"Kapasitas\".\n"
+"   * Alokasi otomatis: pilihan ini untuk konfigurasi otomatis dlm pembuatan\n"
+"     partisi swap dan Ext2 pada ruang kosong di harddisk.\n"
 "\n"
 "\n"
-"\"Nama\" dituliskan dalam bentuk kode sebagai berikut: \"tipe hard drive\","
-"\"nomor hard drive\",\n"
-"\"nomor partisi\" (misalnya \"hda1\").\n"
+"   * Selamatkan tabel partisi: Bila tabel partisi rusak, Anda bisa mencoba\n"
+"     mengembalikannya dg cara ini. Hati-hati dan ingatlah akan resiko "
+"gagal.\n"
 "\n"
 "\n"
-"\"Tipe hard drive\" adalah \"hd\" bila drive tersebut bertipe IDE dan "
-"bernilai \"sd\"\n"
-"bila berupa drive SCSI.\n"
+"   * Tak jadi: Anda bisa gunakan untuk membatalkan aksi ini\n"
 "\n"
 "\n"
-"\"Nomor Hard Drive\", selalu berupa huruf setelah \"hd\" atau \"sd\". Bila "
-"berupa IDE,\n"
-"maka:\n"
+"   * Reload: Anda bisa gunakan pilihan ini untuk membatalkan partisi dan\n"
+"     mengembalikan tabel partisi semula.\n"
 "\n"
-"   *\"a\" berarti \"hard drive master pada kontroller IDE primer\",\n"
 "\n"
-"   *\"b\" berarti \"hard drive slave pada kontroler IDE primer\",\n"
+"   * Wizard: Bila Anda ingin menggunakan wizard untuk mempartisi harddisk,\n"
+"     pilihlah ini. Cara ini disarankan bila Anda tak faham ttg partisi.\n"
 "\n"
-"   *\"c\" berarti \"hard drive master pada kontroler IDE sekunder\",\n"
 "\n"
-"   *\"d\" berarti \"hard drive slave pada kontroler IDE sekunder\",\n"
+"   * Restore dari Disket: Bila Anda pernah menyimpan partisi ke disket, "
+"Anda\n"
+"     bisa kembalikan menjadi semula dengan cara ini.\n"
 "\n"
 "\n"
-"Pada drive SCSI, \"a\" berarti \"hard drive utama, \"b\" berarti \"hard "
-"drive kedua\", dsb..."
-
-#: ../../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 ""
-"Pilih hard drive yang hendak dihapus untuk disediakan bagi partisi Linux "
-"Mandrake.\n"
-"Hati-hati, semua data di situ akan hilang dan tidak dapat dikembalikan "
-"seperti semula."
-
-#: ../../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"
+"   * Simpan ke disket: Pilih ini bila Anda hendak menyimpan tabel partisi "
+"ke\n"
+"     disket utk keperluan di kemudian hari. Amat disarankan Anda melakukan\n"
+"     hal ini.\n"
 "\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
-msgstr ""
-"Pilih \"OK\" bila Anda ingin menghapus semua data dan partisi yang ada di "
-"hard drive ini. Hati\n"
-"hati setelah mengklik \"OK\" Anda tidak dapat mengembalikan data dan partisi "
-"yang ada di drive\n"
-"ini termasuk data Windows.\n"
+"   * Selesai: pilih saat usai mempartisi harddisk dan ingin menyimpannya.\n"
 "\n"
 "\n"
-"Pilih \"Batal\" untuk membatalkan aksi ini tanpa kehilangan data dan partisi "
-"yang ada dalam\n"
-"hard drive ini."
-
-#: ../../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"
+"Sebagai informasi, Anda bisa mengakses pilihan-pilihan di atas dengan\n"
+"memakai keyboard saja, pilihlah partisi dg tombol Tab dan panah Atas/Bawah.\n"
 "\n"
 "\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
+"Saat partisi dipilih, Anda bisa gunakan:\n"
 "\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"         * Ctrl C utk membuat partisi baru pada partisi yg masih kosong\n"
+"         * Ctrl D utk menghapus partisi\n"
+"         * Ctrl M utk menset titik mount\n"
+"         \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"
+"Bila Anda menginstal pada komputer PPC, Anda perlu membuat partisi bootstrap "
+"HFS kecil sebesar paling tidak 1 MB untuk\n"
+"digunakan oleh bootloader yaboot. Bila Anda ingin membuat partisi itu lebih "
+"besar lagi, semisal 50MB, Anda bisa memanfaatkannya utk menyimpan\n"
+"kernel cadangan dan image ramdisk utk situasi boot darurat."
+
+#: ../../help.pm_.c:460
+#, fuzzy
+msgid ""
+"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"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE hard drives:\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"
-"   * \"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 ""
-"Ada lebih dari satu partisi Microsoft Windows yang saya deteksi pada hard "
-"drive ini. \n"
-"Silakan pilih partisi yang hendak Anda rubah ukurannya untuk diinstallkan "
-"sistem operasi\n"
+"Ada lebih dari satu partisi wicrosoft mindows terdeteksi pada harddisk "
+"Anda.\n"
+"Pilih partisi yang hendak Anda ubah ukurannya untuk instalasi sistem "
+"operasi\n"
 "Linux Mandrake.\n"
 "\n"
 "\n"
 "Sebagai Informasi, tiap-tiap partisi terdaftar dengan cara berikut: \"Nama "
-"di Linux\",\"Nama di Windows\", \"Kapasitas\".\n"
+"di Linux\",\"Nama di windows\", \"Kapasitas\".\n"
 "\n"
 "\n"
 "\"Nama di Linux\" dituliskan dalam bentuk kode sebagai berikut: \"tipe hard "
@@ -2634,947 +2812,487 @@ msgstr ""
 "drive kedua\", dsb...\n"
 "\n"
 "\n"
-"\"Nama pada WIndows\" adalah huruf hard drive Anda pada WIndows (disk "
-"pertamapada partisi disebut \"C:\")."
+"\"Nama pada windows\" adalah huruf hard drive Anda pada windows (disk "
+"pertama pada partisi disebut \"C:\")."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
-msgstr "Mohon sabar sebentar yaa... Proses ini akan makan waktu beberapa menit"
+msgstr "Sabar... Proses ini akan makan waktu beberapa menit"
 
-#: ../../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"
-"\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 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 \"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"
-"Click on \"OK\" when you are ready to format partitions.\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"
-"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 ""
-"Tiap-tiap partisi yang telah dibuat perlu diformat agar dapat digunakan "
-"(format berarti membuat\n"
-"filesystem).\n"
-"\n"
+"Pilih \"Instal\" bila Anda belum pernah menginstall Linux Mandrake\n"
+"atau bila Anda ingin menginstall banyak sistem operasi.\n"
 "\n"
-"Saat ini, Anda bisa melakukan format ulang pada partisi yang sudah ada untuk "
-"menghapus datanya.\n"
-"BIla ini hendak Anda lakukan, pilih dulu partisi yang hendak diformat.\n"
 "\n"
+"Pilih \"Update\" bila ingin meng-update Linux Mandrake yang sudah ada.\n"
 "\n"
-"Perhatikan bahwa Anda tidak perlu melakukan format ulang ini pada semua "
-"partisi yang sudah ada.\n"
-"Namun Anda perlu melakukan format ulang pada partisi yang akan diisi sistem "
-"operasi (misalnya pada\n"
-"partisi \"/\", \"./usr\", atau \"/var\"), tapi Anda tidak perlu melakukan "
-"format ulang pada partisi  yang\n"
-"berisi data yang hendak masih digunakan (misalnya \"/home\").\n"
 "\n"
+"Anda bisa pilih tingkat instal/update sesuai pengetahuan Anda ttg GNU/"
+"Linux:\n"
 "\n"
-"Mohon hati-hati dalam meilih partisi karena setelah diformat, semua data "
-"akan hilang dan tidak\n"
-"dapat dikembalikan ke kondisi semula.\n"
+"* Disarankan: pilih ini bila Anda belum pernah menginstal OS GNU/Linux.\n"
+" proses instalasi amat mudah dan Anda hanya ditanya bbrp pertanyaan.\n"
 "\n"
 "\n"
-"Silakan pilih \"OK\" untuk melakukan format partisi\n"
+"* Custom: pilih bila Anda familiar dg GNU/Linux dan bisa membuat sistem\n"
+" menjadi sesuai kebutuhan Anda (workstation, server, atau development).\n"
+" Anda akan ditanya lebih banyak dari instalasi \"Disarankan\". Anda perlu\n"
+" tahu bagaimana GNU/Linux bekerja bila memilih kelas instalasi ini.\n"
 "\n"
 "\n"
-"Silakan pilih \"Batal\" untuk memilih partisi lain untuk diinstallkan Linux "
-"Mandrake."
+"* Pakar: pilih ini bila Anda tahu banyak ttg GNU/Linux. Seperti di kelas\n"
+" \"Custom\", Anda bisa menentukan kegunaan utama sistem ini (workstation,\n"
+" server, atau development). Hati-hati bila memilih kelas ini karena Anda\n"
+" akan dapat melakukan instalasi bebas. Bbrp pertanyaan sulit dijawab jika\n"
+" Anda tak berpengetahuan GNU/Linux yg kuat. Jangan pilih kelas ini kecuali\n"
+" Anda tahu apa yang Anda lakukan."
 
-#: ../../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 ""
-"Sekarang kamu pilih dulu grup paket yang mau kamu install\n"
-"atau yang mau diupgrade.\n"
-"\n"
-"DrakX sekarang akan cek apakah kamu masih punya sisa space kosong untuk\n"
-"menginstall ini semua, kalau nggak nanti kamu akan diberitahu kok.\n"
-"Tapi kalau kamu mau cuek aja mau install walaupun spacenya nggak cukup\n"
-"gua akan menginstall semua paketnya, tapi ada beberapa paket yang aku rasa\n"
-"kurang penting akan nggak diinstall. Pada daftar di bawah ini kamu bisa\n"
-"pilih \"Pilih paket sendiri\"; kalau-kalau kamu pingin melihat \n"
-"paket-paket yang ada (ada 1000an lebih lho...)"
 
-#: ../../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"
-"\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 ""
-"Anda dapat memilih tiap-tiap paket yang hendak Anda install\n"
-"\n"
-"\n"
-"Anda dapat membuka atau menutup tree dengan mengklik pada pilihan di sudut "
-"kiri pada\n"
-"windows paket\n"
-"\n"
-"\n"
-"Bila Anda hendak melihat daftar paket yang diurut secara alfabet, pilih ikon "
-"\"Togel flat dan urut grup\".\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"
-"Bila Anda tidak hendak diberitahu tentang dependensi paket, pilih "
-"\"Dependensi otomatis\"\n"
-"Dengan cara ini bila Anda membuang suatu paket, maka paket-paket terkait "
-"lainnya akan dibuang\n"
-"juga secara otomatis tanpa pemberitahuan."
-
-#: ../../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."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"Kalau kamu punya semua CD pada daftar di atas, tekan OK.\n"
-"Kalau nggak punya sama sekali, click Baal.\n"
-"Kalau cuma punya beberapa aja, pilih aja, trus klik Ok."
 
-#: ../../help.pm_.c:369
+#: ../../help.pm_.c:547
 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"
-"\n"
-"Please be patient."
-msgstr ""
-"Sistem operasi Linux Mandrake Anda yang baru sedang saya installkan.\n"
-"Proses ini akan memakan waktu beberapa menit (bergantung pada ukuran yang "
-"Anda install\n"
-"dan kecepatan komputer Anda.)\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"
-"Sabar ya..."
-
-#: ../../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 ""
-"Sekarang Anda bisa test mousenya. Tekan tombol mousenya dan gerakan mousenya "
-"juga\n"
-"untuk mencoba apakah sudah bisa atau belum. Bila belum, silahkan pilih "
-"\"Batal\" untuk kembali\n"
-"memilih driver yang lain."
 
-#: ../../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 ""
 "Pilih port yang betul. Misalnya COM1 di Windows sama dengan ttyS0 di \n"
 "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 ""
-"Bila Anda hendak menghubungkan komputer ini ke Internet atau ke jaringan\n"
-"lokal, silakan pilih konfigurasi yang benar. Nyalakan perangkat terkait "
-"sebelum\n"
-"memilih konfigurasi agar dapat dideteksi oleh DrakX secara otomatis.\n"
-"\n"
-"\n"
-"BIla anda tidak memiliki koneksi ke Internet atau jaringan lokal, pilih "
-"saja\n"
-"\"Matikan Jaringan\".\n"
-"\n"
-"\n"
-"Bila Anda hendak mengkonfigurasikan jaringan nanti setelah proses instalasi "
-"selesai,atau bila Anda sudah selesai mengkonfigurasikan koneksi jaringan, "
-"pilih \"Selesai\"."
-
-#: ../../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 ""
-"Saya tidak dapat menemukan modem di komputer ini. Silakan pilih port serial "
-"mana\n"
-"modem Anda dicolokkan.\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"
-"sebagai misal, port serial pertama (pada Microsoft Windows dikenal dengan "
-"\"COM1\")\n"
-"adalah \"ttyS0\" di GNU/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 ""
-"Sekarang Anda bisa memasukan pilihan dialup. Bila Anda tidak tahu\n"
-"atau ragu-ragu, informasi yang benar bisa Anda tanyakan kepada\n"
-"Internet Service Provider tempat Anda berlangganan. Bila Anda tidak\n"
-"memasukan DNS (name server) di sini, informasi tersebut akan\n"
-"saya cari sendiri pada Internet Service Provider Anda saat melakukan koneksi "
-"nanti."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Bila modem yang Anda punya adalah modem eksternal, maka tolong dong "
-"dinyalakan supaya DrakXbisa mendeteksinya secara otomatis."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Silakan nyalakan modemnya dan pilih mana modem yang Anda punya"
-
-#: ../../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 ""
-"Bila Anda tidak yakin dengan informasi di atas apakah benar atau tidak\n"
-"atau bahkan bila Anda sangat tidak tahu atau ragu mau isi apa, tenang saja\n"
-"informasi di atas bisa Anda tanyakan kepada Internet Service Provider Anda.\n"
-"Bila Anda tidak mengisi DNS (name server) di sini, nanti akan saya cari "
-"sendiri\n"
-"dari Internet Service Provider saat melakukan koneksi ke Internet."
-
-#: ../../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 ""
-"Anda bisa masukkan nama host Anda sekarang. Bila Anda nggak yakin apa yang "
-"harus dimasukkan,\n"
-"informasi ini bisa diperoleh dari ISP."
-
-#: ../../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 ""
-"Silakan konfigurasikan device jaringan Anda:\n"
-"\n"
-"  * Alamat IP: Kalau Anda nggak tahu, tanyakan sana pada network "
-"administratornya.\n"
-"     Jangan masukkan alamat IP kalau Anda pilih \"IP Otomatis\" di bawah.\n"
-"\n"
-"\n"
-"  - Netmask: Pilih aja \"255.255.255.0\", kecuali kalau ragu tanya juga ke\n"
-" network administratornya.\n"
-"\n"
 "\n"
-"  - IP otomatis: Bila network Anda menggunakan bootp atau protokol dhcp, "
-"pilih\n"
-" ini. Bila Anda pilih ini, nggak usah masukkan alamat IP di \"Alamat IP\". "
-"Bila\n"
-" Anda ragu juga, tanya lagi ke network administrator."
-
-#: ../../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 ""
-"Anda sekarang bisa memasukan nama host. Bila Anda tidak tahu atau ragu\n"
-"silakan kontak network administrator Anda saja."
-
-#: ../../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 ""
-"Sekarang Anda boleh memasukan nama host. Bila tidak tahu\n"
-"atau tidak pasti, kosongkan saja deh."
-
-#: ../../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 ""
-"Anda bisa masukkan dialup sekarang. Bila Anda nggak yakin apa yang harus "
-"dimasukkan,\n"
-"informasi ini bisa diperoleh dari 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."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Bila Anda mau pakai proxy, sekarang saatnya untuk mengkonfigurasi. Bila "
-"Anda\n"
-"nggak tahu pakai proxy apa nggak, tanya gih ke network administratornya atau "
-"ISP."
 
-#: ../../help.pm_.c:459
+#: ../../help.pm_.c:600
 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 ""
-"Anda bisa install paket kriptografi bila koneksi Internet Anda telah\n"
-"dikonfig dengan benar. Sekarang pilih mirror tempat Anda ingin download\n"
-"paket kriptografinya dan kemudian pilih paketnya.\n"
-"\n"
-"Perhatikan bahwa Anda harus pilih mirror dan kriptografi sesuai ketentuan\n"
-"yang berlaku di daerah Anda."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Sekarang pilih zonawaktu tempat Anda tinggal"
-
-#: ../../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 mengatur jam dengan GMT atawa \"Greenwich Mean Time\" dan \n"
-"menterjemahkannya ke waktu lokal sesuai dengan timezone yang Anda pilih.\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"
-"Bila Anda punya Microsoft Windows di komputer ini, pilih \"Tidak\""
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\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"
-"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 ""
-"Kamu boleh pilih service mana aja yang mau dijalankan saat boot.\n"
-"Kamu bisa lihat keterangan servicenya pada baloon help kecil yang akan "
-"muncul\n"
-"kalau kamu geserkan mousenya ke atas nama servicenya.\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
-"Hati-hati pilihnya ya, apalagi kalau mau pakai sistem ini sebagai server\n"
-"jangan sembarang nyalakan service yang nggak perlu. Mohon diingat\n"
-"bahwa ada service yang berbahaya bila dinyalakan pada server\n"
-"Pokoknya, pilih saja service yang Anda anggap penting."
-
-#: ../../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 ""
-"Sekarang Anda bisa mengkonfigurasikan printer lokal (terhubung ke komputer "
-"Anda) atau\n"
-"printer remote (yang diakses via jaringan Unix, Netware, atau 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 ""
-"Bila Anda hendak mencetak dari sistem ini, silakan pilih sistem pencetakan "
-"antara CUPS dan LPR\n"
-"\n"
-"\n"
-"CUPS adalah sistem cetak yang baru dan powerfull di Unix (CUPS adalah "
-"singkatan dari\n"
-"\"Common Unix Printing System\"). Sistem ini adalah sistem pencetakan "
-"default di Linux Mandrake.\n"
-"\n"
-"\n"
-"LPR adalah sistem cetak kuno yang masih digunakan pada versi-versi lama "
-"Linux Mandrake.\n"
-"\n"
-"\n"
-"Bila Anda tidak memiliki printer, pilih \"Tidak Ada\""
 
-#: ../../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 ""
-"GNU/Linux dapat menggunakan berbagai jenis printer. Tiap-tiap tipe "
-"memerlukan setup\n"
-"yang berbeda\n"
-"\n"
-"\n"
-"Bila printer tersambung secara fisik dalam komputer ini, pilih\n"
-"\"Printer Lokal\". \n"
-"\n"
-"Bila Anda menggunakan printer Unix jarak jauh, pilih\n"
-"\"Printer remote\".\n"
+"LILO (LInux LOader) dan Grub adalah bootloader. Dua-duanya akan memboot\n"
+"GNU/Linux atau sistem operasi lain yang ada di komputer ini.\n"
+"Biasanya, sistem operasi yang sudah ada akan secara normal di deteksi dan\n"
+"diinstallkan. Bila ternyata nanti tak bisa, Anda bisa tambahkan sendiri\n"
+"secara manual di sini. Hati-hati yah nanti waktu kasih parameternya.\n"
 "\n"
 "\n"
-"Bila Anda hendak menggunakan printer pada mesin Microsoft Windows (atau\n"
-"pada mesin Unix dengan SMB), maka pilih \"SMB/WIndows 95/98/NT\"."
+"Anda juga bisa menutup akses ke sistem operasi tertentu. Caranya gampang "
+"aja\n"
+"Anda bisa hapus entrinya disini. Tapi untuk bisa masuk ke sistem operasi "
+"itu\n"
+"Anda perlu bootdisk nantinya."
 
-#: ../../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"
-"\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"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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 ""
-"Silakan nyalakan printer sebelum DrakX mendeteksinya.\n"
-"\n"
-"Anda perlu mengisi beberapa informasi di sini.\n"
-"\n"
-"\n"
-"   * Nama printer: spooler cetak menggunakan nama \"lp\" sebagai nama "
-"printer default\n"
-"Jadi Anda pelru punya sebuah printer dengan nama \"lp\". Bila Anda memiliki "
-"cuma \n"
-"satu buah printer saja, Anda bisa menggunakan beberapa nama. Tuliskan saja "
-"nama\n"
-"itu dan pisahkan dengan karakter pipe \"|\". Jadi untuk memberi nama printer "
-"dengan\n"
-"nama yang mudah dimengerti, Anda bisa tuliskan: \"Printer saya|lp\".\n"
-"   Printer yang memiliki \"lp\" pada namanya akan menjadi printer default.\n"
-"\n"
-"\n"
-"   * Deskripsi: ini boleh diisi boleh tidak, tapi bila diisi akan lebih "
-"memudahkan Anda\n"
-"untuk membedakan antara printer bila Anda memiliki printer lebih dari satu "
-"buah atau bila\n"
-"printer ini akan diakses oleh banyak orang.\n"
+"Sekarang saya ingin tanya kepada Anda\n"
+"tempat saya bisa meletakkan informasi yang akan dipakai GNU/Linux saat "
+"boot.\n"
 "\n"
 "\n"
-"   * Lokasi: Anda bisa menuliskan informasi lebih detil tentang lokasi "
-"printer ini.\n"
-"(misalnya \"Printer yang ada di lantai 2\").\n"
+"Kalau Anda kurang tahu, yah pilih saja \"Sektor pertama di \n"
+"drive (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"
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\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 ""
-"Anda perlu memasukkan beberapa informasi di sini.\n"
-"\n"
-"\n"
-"   * Nama antrian: spooler cetak menggunakan nama \"lp\" sebagai nama "
-"printer default\n"
-"Jadi Anda pelru punya sebuah printer dengan nama \"lp\". Bila Anda memiliki "
-"cuma \n"
-"satu buah printer saja, Anda bisa menggunakan beberapa nama. Tuliskan saja "
-"nama\n"
-"itu dan pisahkan dengan karakter pipe \"|\". Jadi untuk memberi nama printer "
-"dengan\n"
-"nama yang mudah dimengerti, Anda bisa tuliskan: \"Printer saya|lp\".\n"
-"   Printer yang memiliki \"lp\" pada namanya akan menjadi printer default.\n"
-"\n"
-"\n"
-"   * Direktori Spool: Dalam direktori ini semua job printer akan disimpan. "
-"BIla Anda tidak\n"
-"mengerti biarkan saja terisi dalam nilai defaultnya.\n"
-"\n"
-"\n"
-"   * Koneksi Printer: Bila printer tersambung secara fisik dalam komputer "
-"ini, pilih\n"
-"\"Printer Lokal\". Namun bila Anda menggunakan printer Unix jarak jauh, "
-"pilih\n"
-"\"Printer lpd remote\".\n"
-"\n"
-"\n"
-"   Bila Anda hendak menggunakan printer pada mesin Microsoft Windows (atau\n"
-"pada mesin Unix dengan SMB), maka pilih \"SMB/WIndows 95/98/NT\".\n"
-"\n"
-"\n"
-"   Bila Anda hendak mengakses printer pada jaringan Netware, pilih \"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 ""
-"Printer Anda tidak dapat dideteksi. Silakan tuliskan nama device atau di "
-"mana printer Anda\n"
-"tersambung.\n"
-"\n"
-"\n"
-"Sebagai contoh, printer yang disambung ke port parallel pertma komputer "
-"disebut\n"
-"\"/dev/lp0\" pada GNU/Linux, dan disebut \"LPT1\" pada Microsoft Windows."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Anda harus pilih printer yang Anda punya pada daftar di atas."
-
-#: ../../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"
+"DrakX akan coba cari adapter SCSI PCI.\n"
+"Kalau DrakX menemukan adapter SCSI dan punya drivernya, maka\n"
+"drivernya akan secara otomatis diinstalkan.\n"
 "\n"
+"Bila Anda tidak punya adapter SCSI, SCSI ISA, atau SCSI PCI yang\n"
+"DrakX tak punya drivernya, maka DrakX akan konfirmasi lagi.\n"
+"Bila memang tak ada adapternya, klik aja 'Tak'. Bila klik 'Ya'\n"
+"maka daftar driver akan ditampilkan, dan ente silakan pilih.\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 ""
-"Silakan pilih konfigurasi yang tepat bergantung tipe printer yang Anda "
-"punya.\n"
-"Silakan baca dokumentasinya bila Anda tidak tahu harus pilih apa di sini.\n"
 "\n"
+"Kalau Anda ingin menentukan sendiri adapternya, DrakX akan \n"
+"menanyakan apakah ada option lagi. Anda harus perbolehkan DrakX\n"
+"mendeteksi hardwarenya. Biasanya sih bisa kalau begini.\n"
 "\n"
-"Anda akan dapat melakukan test pada konfigurasi ini nanti dan bisa juga\n"
-"merubah konfigurasi ini bila tidak berjalan sebagaimana mestinya."
+"Kalau Anda tidak mau, Anda bisa coba kasih optionnya\n"
+"Coba baca Buku Petunjuk (bab 3, bagian: \"Collective Informations on your "
+"hardware\") untuk trik mendapatkan informasi\n"
+"ini dari windows (itu juga kalau Anda install yaaa),\n"
+"dari dokumentasi hardware, atau dari website pabriknya\n"
+"(kalau ada akses ke Internet)."
 
-#: ../../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"
+"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"
-"The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\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"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"Sekarang Anda mesti berikan password untuk root untuk\n"
-"sistem Linux-Mandrake ini. Passwordnya harus diketikkan dua kali untuk\n"
-"verifikasi bahwa Anda tidak salah ketik.\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"
-"Root adalah sistem administrator. Hanya orang yang punya akses ke\n"
-"acount administrator saja yang dapat mengatur dan mengelola sistem.\n"
-"Awas, account administrator yang disalah gunakan atau dipakai\n"
-"tanpa izin akan sangat membahayakan integritas sistem, data,\n"
-"dan sistem lain yang terhubung. \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"
-"Password haruslah campuran dari\n"
-"karakter alfanumerik dan panjangnya minimal 8 karakter. Jangan\n"
-"pernah menuliskan password Anda di kertas atau dimana saja. \n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"Jangan\n"
-"buat password Anda terlalu panjang atau rumit, ntar bisa lupa."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Agar sistem Anda lebih secure, silahkan pilih \"Gunakan file shadow\" dan \n"
-"\"Password Pakai 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 ""
-"Bila network Anda menggunakan NIS, pilih \"Gunakan NIS\". Kalau nggak tahu, "
-"tanya\n"
-"network admin Anda dong."
-
-#: ../../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"
+" * 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"
-"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"
+" * 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"
-"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."
+" * 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 ""
-"Silahkan Anda buat satu atau lebih user \"biasa\", setelah Anda\n"
-"membuat user \"pihak berwenang\", yaitu root. Anda bisa buat\n"
-"user untuk tiap orang yang Anda perbolehkan untuk mengakses komputer\n"
-"ini. Perhatikan bahwa tiap account user akan memiliki preferesi\n"
-"sendiri-sendiri (environment grafis, seting program dsb)\n"
-"dan juga punya \"direktori home\" sendiri, tempat preferensi tadi\n"
-"disimpan\n"
-"\n"
-"\n"
-"Pertama-tama, buatlah account untuk Anda sendiri! Buatlah walau Anda\n"
-"adalah satu-satunya orang yang mengakses mesin ini. Anda nanti tidak\n"
-"BOLEH mengakses mesin ini untuk keperluan sehari-hari, karena merupakan\n"
-"resiko besar bila Anda sering login sebagai root. Biasanya ini disebabkan\n"
-"karena salah ketik, dsb.\n"
+"Anda bisa menambahkan entri tambahan untuk yaboot, baik untuk sistem operasi "
+"yang\n"
+"lain, atau kernel yang berbeda, atau untuk image boot darurat.\n"
 "\n"
 "\n"
-"Karena itu, biasakan untuk konek ke msein ini dengan menggunakan account\n"
-"yang telah Anda buat disini, dan login sebagai root, hanya untuk \n"
-"keperluan administratif dan maintenance saja yah."
-
-#: ../../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 ""
-"Saya sangat menyarankan Anda untuk membuat boot disk. Bila Anda tidak\n"
-"dapat memboot komputer Anda, boot disk adalah satu-satunya cara untuk "
-"menyelamatkan sistem\n"
-"tanpa menginstall ulang."
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
+"Untuk sistem operasi lain, entri ini berisi label dan partisi root saja.\n"
 "\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"Sekarang saya ingin tanya kepada Anda\n"
-"tempat saya bisa meletakkan informasi yang akan dipakai GNU/Linux saat "
-"boot.\n"
+"untuk sistem Linux, ada beberapa pilihan:\n"
 "\n"
 "\n"
-"Kalau Anda kurang tahu, yah pilih saja \"Sektor pertama di \n"
-"drive (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 ""
-"Biasanya orang pilih \"/dev/hda\", kecuali kalau Anda pilih yang lain (yaitu "
-"drive master IDE) atau \"/dev/sda\" (disk SCSI utama)."
-
-#: ../../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"
-"\n"
+"  - Label: ini adalah nama yang bisa dipilih saat prompt yaboot.\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 ""
-"LILO (LInux LOader) dan Grub adalah bootloader. Dua-duanya akan memboot\n"
-"GNU/Linux atau sistem operasi lain yang ada di komputer ini.\n"
-"Biasanya, sistem operasi yang sudah ada akan secara normal di deteksi dan\n"
-"diinstallkan. Bila ternyata nanti nggak bisa, Anda bisa tambahkan sendiri\n"
-"secara manual di sini. Hati-hati yah nanti waktu kasih parameternya.\n"
 "\n"
+"  - image: ini adalah nama kernel untuk diboot. Biasanya bernama vmlinux "
+"atau\n"
+"nama lain yang mirip dengan vmlinux atau ditambahkan ekstensi lain.\n"
 "\n"
-"Kamu juga bisa menutup akses ke sistem operasi tertentu. Caranya gampang "
-"aja\n"
-"kamu bisa hapus entrinya disini. Tapi untuk bisa masuk ke sistem operasi "
-"itu\n"
-"kamu perlu bootdisk nantinya."
-
-#: ../../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"
+"  - root: device root atau / pada instalasi LInux di sistem \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"
+"  - append: pada hardware Apple, pilihan kernel append sering digunakan\n"
+"untuk membantu inisialisasi hardware video, atau untuk mengaktifkan emulasi "
+"tombol mouse pada keyboard\n"
+"ini berguna untuk mouse Apple yang tidak memiliki tombol kedua dan ketiga.\n"
+"Ini ada beberapa contohnya:\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
+"\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103.111 "
+"hda=autotone\n"
 "\n"
+"\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \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 ""
-"Pilihan LILO dan grub adalah:\n"
-"  - Boot device: Set nama devicenya (misalnya hard disk partisi) yang berisi "
-"boot sector\n"
-"                 pilih \"/dev/hda\", kecuali kalau Anda tahu yang pastinya.\n"
+"  - initrd: pilihan ini untuk meload module pada saat boot pertama, sesaat "
+"sebelum\n"
+"device boot aktif, atau untuk meload image ramdisk untuk situasi boot "
+"darurat.\n"
 "\n"
 "\n"
-"  - Delay sebelum boot ke image default: Menentukan waktu dalam sepersepuluh "
-"detik\n"
-" sebelum boot loader akan meload image yang default (pertama). Ini berguna\n"
-" pada sistem yang boot dari hard disk dan keyboardnya dinyalakan. Boot "
-"loader\n"
-" tidak menunggu bila \"delay\" dihilangkan atau diset ke nol.\n"
+"  - initrd-size: ukuran ramdisk default biasanya adalah 4096 byte. bila Anda "
+"ingin\n"
+"mengalokasikan ramdisk dengan nilai yang lebih besar, maka gunakanlah "
+"pilihan ini.\n"
 "\n"
 "\n"
-" - Video mode: Menentukan mode text VGA yang dipilih saat booting. \n"
-" Setting yang bisa dipakai: \n"
-"  * normal: pilih mode text 80x25\n"
-"  * <angka>: gunakan mode text.\n"
+"  - read-write: biasanya partisi 'root' dimount secara read-only agar bisa "
+"mengecek filesystem\n"
+"sebelum dimount. Anda bisa mengganti kelakuan aslinya di sini.\n"
 "\n"
 "\n"
-"   - Hapus \"/tmp\" saat boot bila Anda ingin menghapus semua file-file di "
-"dalam direktori\n"
-"\"/tmp\" saat boot sistem dimulai.\n"
+"  - NoVideo: Bila hardware video Apple bertingkah aneh, Anda bisa "
+"menggunakan\n"
+"pilihan ini, dengan dukungan native framebuffer.\n"
 "\n"
 "\n"
-"   - Ukuran RAM yang tepat. Duh, ngga ada metode standar untuk mendapatkan \n"
-"angka jumlah RAM yang tepat di komputer tertentu. Jadi, Linux mungkin akan\n"
-"salah mendeteksi jumlah RAM yang Anda punya sekarang. Bila benar, saya "
-"salah\n"
-"tebak angka RAMnya di sini, silakan masukkan angka yang benar. Oh ya,\n"
-"beda 2 atau 4 MB sih ngga masalah loh."
+"  - Default: Pilihan ini adalah untuk menjadikan entri ini dapat terpilih "
+"pada yaboot\n"
+"hanya dengan menekan tombol ENTER pada prompt. Entri yang dijadikan default\n"
+"juga akan diberi tanda dengan tanda '*' pada saat Anda menekan tombol TAB "
+"untuk\n"
+"memilih pilihan boot."
 
-#: ../../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"
-"\n"
-"Yaboot main options are:\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"
+" * 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 ""
 "Yaboot adalah bootloader untuk hardware Macintosh NewWorld. Yaboot\n"
 "dapat memboot GNU/Linux, MacOS, atau MacOSX bila ada di dalam komputer ini.\n"
@@ -3624,342 +3342,78 @@ msgstr ""
 "delay Open Firmware telah\n"
 "terlampaui."
 
-#: ../../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"
+"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"
-"  - Root: The root device or '/' for your Linux installation.\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"
-"  \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"
-"\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 ""
-"Anda bisa menambahkan entri tambahan untuk yaboot, baik untuk sistem operasi "
-"yang\n"
-"lain, atau kernel yang berbeda, atau untuk image boot darurat.\n"
-"\n"
-"\n"
-"Untuk sistem operasi lain, entri ini berisi label dan partisi root saja.\n"
-"\n"
-"\n"
-"untuk sistem Linux, ada beberapa pilihan:\n"
-"\n"
-"\n"
-"  - Label: ini adalah nama yang bisa dipilih saat prompt yaboot.\n"
-"\n"
-"\n"
-"  - image: ini adalah nama kernel untuk diboot. Biasanya bernama vmlinux "
-"atau\n"
-"nama lain yang mirip dengan vmlinux atau ditambahkan ekstensi lain.\n"
-"\n"
-"\n"
-"  - root: device root atau / pada instalasi LInux di sistem \n"
-"\n"
-"\n"
-"\n"
-"  - append: pada hardware Apple, pilihan kernel append sering digunakan\n"
-"untuk membantu inisialisasi hardware video, atau untuk mengaktifkan emulasi "
-"tombol mouse pada keyboard\n"
-"ini berguna untuk mouse Apple yang tidak memiliki tombol kedua dan ketiga.\n"
-"Ini ada beberapa contohnya:\n"
-"\n"
-"\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103.111 "
-"hda=autotone\n"
-"\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
-"\n"
-"\n"
-"\n"
-"  - initrd: pilihan ini untuk meload module pada saat boot pertama, sesaat "
-"sebelum\n"
-"device boot aktif, atau untuk meload image ramdisk untuk situasi boot "
-"darurat.\n"
-"\n"
-"\n"
-"  - initrd-size: ukuran ramdisk default biasanya adalah 4096 byte. bila Anda "
-"ingin\n"
-"mengalokasikan ramdisk dengan nilai yang lebih besar, maka gunakanlah "
-"pilihan ini.\n"
-"\n"
-"\n"
-"  - read-write: biasanya partisi 'root' dimount secara read-only agar bisa "
-"mengecek filesystem\n"
-"sebelum dimount. Anda bisa mengganti kelakuan aslinya di sini.\n"
-"\n"
-"\n"
-"  - NoVideo: Bila hardware video Apple bertingkah aneh, Anda bisa "
-"menggunakan\n"
-"pilihan ini, dengan dukungan native framebuffer.\n"
-"\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
 "\n"
-"  - Default: Pilihan ini adalah untuk menjadikan entri ini dapat terpilih "
-"pada yaboot\n"
-"hanya dengan menekan tombol ENTER pada prompt. Entri yang dijadikan default\n"
-"juga akan diberi tanda dengan tanda '*' pada saat Anda menekan tombol TAB "
-"untuk\n"
-"memilih pilihan boot."
-
-#: ../../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"
+" * \"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"
-"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 ""
-"SILO adalah bootloader untuk SPARC: Dianya akan memboot\n"
-"GNU/Linux atau sistem operasi lain yang ada di komputer ini.\n"
-"Biasanya, sistem operasi yang sudah ada akan secara normal di deteksi dan\n"
-"diinstallkan. Bila ternyata nanti nggak bisa, Anda bisa tambahkan sendiri\n"
-"secara manual di sini. Hati-hati yah nanti waktu kasih parameternya.\n"
-"\n"
-"\n"
-"Kamu juga bisa menutup akses ke sistem operasi tertentu. Caranya gampang "
-"aja\n"
-"kamu bisa hapus entrinya disini. Tapi untuk bisa masuk ke sistem operasi "
-"itu\n"
-"kamu perlu bootdisk nantinya."
 
-#: ../../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 ""
-"Pilihan SILO dan grub adalah:\n"
-"  - Instalasi Bootloader: Tempat Anda hendak meletakkan informasi boot\n"
-" ke GNU/Linux. Pilih aja \"Sektor pertama di drive (MBR)\", kecuali\n"
-" elu udah tau tempatnya\n"
-"\n"
-"\n"
-"  - Delay sebelum boot ke image default: Menentukan waktu dalam sepersepuluh "
-"detik\n"
-" sebelum boot loader akan meload image yang default (pertama). Ini berguna\n"
-" pada sistem yang boot dari hard disk dan keyboardnya dinyalakan. Boot "
-"loader\n"
-" tidak menunggu bila \"delay\" dihilangkan atau diset ke nol."
+"Pilih harddrive yg akan dihapus utk disediakan bagi partisi\n"
+"Linux Mandrake. Hati-hati, semua data di situ akan hilang dan\n"
+"tak dapat dikembalikan seperti semula."
 
-#: ../../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"
-"\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"
-"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 ""
-"Sekarang Anda akan mengkonfigurasikan X Window System, yang merupakan\n"
-"inti GUI (Graphical User Interface) bagi GNU/Linux. Sekarang,\n"
-"Anda harus konfigurasikan video card dan monitor. Biasanya\n"
-"tahapan ini akan otomatis, tapi Anda perlu verifikasi\n"
-"hasil deteksi dan memeriksanya, bener apa nggak :)\n"
+"Pilih \"OK\" bila Anda ingin menghapus semua data dan partisi yang ada di "
+"hard drive ini. Hati\n"
+"hati setelah mengklik \"OK\" Anda tidak dapat mengembalikan data dan partisi "
+"yang ada di drive\n"
+"ini termasuk data windows.\n"
 "\n"
 "\n"
-"Setelah itu, X akan dijalankan (kecuali kalau Anda bilang jangan)\n"
-"dan periksa apakah settingnya sudah cocok atau belum.\n"
-"Kalau tidak cocok, Anda bisa kembali lagi dan merubah konfigurasi\n"
-"lalu coba lagi."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"Bila ada yang ngaco pada konfigurasi Xnya, silahken pakai pilihan ini untuk\n"
-"membuat X Window System lebih bagus."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Bila Anda ingin menggunakan login grafik, pilih aje \"Ya\". Kalau nggak,\n"
-"pilih aje \"Tidak\"."
-
-#: ../../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 ""
-"Silakan pilih tingkat keamanan sistem ini. Baca dulu manualnya untuk info "
-"lebihlengkap\n"
-"Kalau Anda ngga tau, ya pilih aja pilihan defaultnya ya.\n"
+"Pilih \"Batal\" untuk membatalkan aksi ini tanpa kehilangan data dan partisi "
+"yang ada dalam\n"
+"hard drive ini."
 
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"Sistem Anda akan direboot.\n"
-"\n"
-"Habis reboot, Linux Mandrake Anda akan diload otomatis.\n"
-"Bila Anda ingin boot ke sistem operasi lain, silahkan baca instruksi\n"
-"tambahan."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Pilih Bahasamu"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Pilih kelas instalasi"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Deteksi hard disk"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Konfigurasi mouse"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Pilih Keyboardmu"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Sekuriti"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Setup filesystem"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Melakukan format partisi"
 
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Paket yang akan diinstall"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Instal system"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Set password root"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Tambahkan user"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Konfigurasi jaringan"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Ringkasan"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Konfigurasi service"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Membuat bootdisk"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Install bootloader"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Konfigurasi X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Keluar dari proses instal"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3973,21 +3427,28 @@ msgid ""
 "\n"
 "Do you really want to install these servers?\n"
 msgstr ""
+"Anda memilih server berikut: %s\n"
+"\n"
+"Server ini aktif sesuai standar. Sementara ini tiada kabar ttg sekuritas,\n"
+"tapi mungkin ada yg telah ditemukan. Jika terjadi, upgrade-lah selekas "
+"mungkin.\n"
+"\n"
+"Jadi instal server ini?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
-msgstr ""
+msgstr "Tanpa domain NIS, broadcast tak dapat dipakai"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Masukkan disket yang sudah diformat dengan tipe FAT di drive %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "Disketnya belum diformat dengan sistem FAT"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3995,30 +3456,20 @@ msgstr ""
 "Untuk menggunakan pilihan paket yang sudah disimpan sebelumnya, bootlah "
 "instalasi dengan pilihan ''linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Error saat membaca file $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Error saat membaca file %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 "Silakan di test mousenya"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Untuk mengaktifkan mouse,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "gerakan rodanya!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -4028,7 +3479,7 @@ msgstr ""
 "Ada hardwaare di komputer ini yang membutuhkan driver ``proprietary''.\n"
 "Anda bisa mencari informasinya di: %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"
@@ -4038,11 +3489,11 @@ msgstr ""
 "Caranya, buatlah partisi (atau pilih di yang sudah ada).\n"
 "Lalu pilih ``Mount point'' dan set ke `/'"
 
-#: ../../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 "Anda harus buat partisi 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"
@@ -4050,71 +3501,74 @@ msgid ""
 msgstr ""
 "Anda belum punya partisi swap\n"
 "\n"
-"Cuek aja?"
+"Jalan terus?"
+
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "Anda harus punya partisi FAT termount pada /boot/efi"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Gunakan space bebas"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Tidak ada cukup ruangan untuk mengalokasikan partisi baru"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Gunakan partisi yang sudah ada"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Tidak ada partisi yang bisa digunakan"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
-msgstr "Gunakan partisi Windows untuk loopback"
+msgstr "Gunakan partisi windows untuk loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Partisi mana yang hendak dipakai oleh Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Pilih ukurannya"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Ukuran partisi root dalam MB: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Ukuran partisi swap dalam MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
-msgstr "Gunakan space bebas pada partisi Windows"
+msgstr "Gunakan space bebas pada partisi windows"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
-msgstr "partisi mana yang mau Anda rubah ukurannya?"
+msgstr "partisi mana yang mau Anda ubah ukurannya?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
-msgstr "Sedang menghitung bound filesystem Windows"
+msgstr "Sedang menghitung bound filesystem windows"
 
-#: ../../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 ""
-"Saya tidak dapat merubah ukuran partisi FAT ini,\n"
+"Saya tidak dapat mengubah ukuran partisi FAT ini,\n"
 "Ada error ini yang terjadi: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
-msgstr ""
-"Partisi Windows Anda terlalu terfragmen, silakan jalankan ``defrag'' dulu"
+msgstr "Partisi windows Anda terlalu terfragmen, jalankan ``defrag'' dulu"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4126,62 +3580,60 @@ msgid ""
 msgstr ""
 "AWAS!\n"
 "\n"
-"DrakX sekarang hendak merubah ukuran partisi Windows Anda. Hati-hati:\n"
-"prosesnya ini suanguat berbuahaya. Bila Anda belum melakukannya, silahkan\n"
-"keluar dari proses instalasi ini, lalu reboot ke Windows\n"
+"DrakX sekarang hendak mengubah ukuran partisi windows Anda. Hati-hati:\n"
+"proses ini amat berbahaya. Bila Anda belum melakukannya, silakan\n"
+"keluar dari proses instalasi ini, lalu reboot ke windows\n"
 "untuk scandisk dulu (dan defrag juga) di partisi ini lalu backup datanya.\n"
 "Habis itu yakin dulu, baru tekan Ok."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
-msgstr "Tentukan ukuran untuk menyimpan Windows"
+msgstr "Tentukan ukuran untuk menyimpan windows"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "Partisi %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Resize FAT gagal: %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 ""
-"Tidak ada partisi FAT untuk dirubah ukurannya atau untuk digunakan sebagai "
+"Tidak ada partisi FAT untuk diubah ukurannya atau untuk digunakan sebagai "
 "loopback (atau tidak ada cukup ruangan)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Hapus semua disk"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
-msgstr "Buang Windows(TM)"
+msgstr "Buang 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 ""
-"Anda punya lebih dari satu hard drive, di hard disk mana yang ingin "
-"diinstallkan linux?"
+msgstr "Anda punya beberapa harddisk, yang mana yang ingin di-instal 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 "SEMUA partisi yang ada beserta data pada drive %s akan hilang"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Lakukan partisi disk secara custom"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "gunakan fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4190,28 +3642,28 @@ msgstr ""
 "Anda bisa buat partisi %s \n"
 "Habis itu, jangan lupa simpan dengan menekan tombol `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
-msgstr "Eh, kamu nggak punya cukup ruangan pada partisi windows!"
+msgstr "Eh, Anda tak punya cukup ruangan pada partisi windows!"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
-msgstr "Aduh, ruangannya nggak cukup nih untuk menginstall"
+msgstr "Aduh, ruangannya tak cukup nih untuk menginstall"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "Wizard partisi DrakX menemukan solusi berikut:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Proses partisi gagal: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Up-kan Jaringan"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Matikan Jaringan"
 
@@ -4220,36 +3672,36 @@ msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"Ada error nih, tapi aku nggak tahu cara mengatasinya.\n"
+"Ada error nih, tapi aku tak tahu cara mengatasinya.\n"
 "Lanjutkan saja, tapi resiko tanggung sendiri yah."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Lokasi mount %s ada dua"
 
-#: ../../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 ""
-"Ada paket yang penting nggak benar diinstalnya.\n"
+"Ada paket yang penting tak benar diinstalnya.\n"
 "Mungkin saja drive cdrom atau cdromnya yang rusak.\n"
 "Cek dulu cdromnya di komputer yang sudah terinstall Linux dengan\n"
 "perintah \"rpm -qpl Mandrake/RPMS/*.rpm\" dulu gih\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Selamat Datang di %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
-msgstr "Wah maaf nih, nggak ada floppy drive yah ?"
+msgstr "Wah maaf nih, tak ada floppy drive yah ?"
 
-#: ../../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"
@@ -4263,40 +3715,40 @@ msgstr "Pilih ukuran yang akan diinstal"
 msgid "Total size: "
 msgstr "Ukuran 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 "Ukuran: %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 "Pilih paket yang akan diinstal"
 
-#: ../../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 "Instal"
 
-#: ../../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 "Sedang melakukan instal"
 
 #: ../../install_steps_graphical.pm_.c:499
 msgid "Please wait, "
-msgstr "Silahkan tunggu, "
+msgstr "Silakan tunggu, "
 
-#: ../../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 "Sisa waktu "
 
@@ -4305,21 +3757,21 @@ msgid "Total time "
 msgstr "Total waktu"
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Sedang menyiapkan instalasi"
 
-#: ../../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 "Sedang instal paket %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 "Cuek aja?"
 
-#: ../../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 "Ada error mengurutkan paket"
 
@@ -4327,29 +3779,32 @@ msgstr "Ada error mengurutkan paket"
 msgid "Use existing configuration for X11?"
 msgstr "Gunakan konfigurasi X11 yang ada?"
 
-#: ../../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 ""
-"Sistem Anda memiliki resource yang terlalu rendah. Nantinya Anda akan\n"
-"mengalami kesulitan dalam menginstall Linux-Mandrake. Bila demikian halnya, "
-"Anda bias mencoba instalasi text saja. Untuk hal ini silakan\n"
-"tekan `F1' saat booting pada CDROm, lalu ketikkan `tet'."
+"Sumber daya sistem Anda rendah. Nantinya Anda akan sulit menginstal\n"
+"Linux-Mandrake. Cobalah instalasi text. Untuk hal ini silakan\n"
+"tekan `F1' saat booting pada CDROM, lalu ketikkan `text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Kelas Instal"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
-msgstr "Ehm, silahkan pilih kelas instalasi di bawah:"
+msgstr "Ehm, silakan pilih kelas instalasi di bawah:"
 
-#: ../../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 "Ukuran total grup yang dipilih kira-kira %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"
@@ -4358,14 +3813,14 @@ msgid ""
 "A low percentage will install only the most important packages;\n"
 "a percentage of 100%% will install all selected packages."
 msgstr ""
-"Kalau kamu mau nginstall dengan ukuran yang lebih kecil dari ini,\n"
+"Kalau Anda mau nginstall dengan ukuran yang lebih kecil dari ini,\n"
 "pilih dulu persentase paket yang hendak diinstall.\n"
 "\n"
 "Persentasi kecil berarti akan install paket yang penting-penting saja;\n"
 "dan sebaliknya persentase 100%% akan install semua paket yang tadi sudah\n"
 "dipilih"
 
-#: ../../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"
@@ -4375,118 +3830,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 ""
-"Kamu punya hard disk cuma cukup untuk sekitar %d%% dari seluruh paketini.\n"
+"Anda punya hard disk cuma cukup untuk sekitar %d%% dari seluruh paketini.\n"
 "\n"
-"Kalau kamu mau nginstall dengan ukuran yang lebih kecil dari ini,\n"
+"Kalau Anda mau nginstall dengan ukuran yang lebih kecil dari ini,\n"
 "pilih dulu persentase paket yang hendak diinstall.\n"
 "Persentasi kecil berarti akan install paket yang penting-penting saja;\n"
 "dan sebaliknya persentase %d%% akan install paket yang tadi sudah\n"
 "dipilih sebanyak-banyaknya"
 
-#: ../../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 "Anda akan bisa memilih dengan lebih lengkap nanti"
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Persentase paket yang akan diinstall"
 
-#: ../../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 "Pilihan Grup Paket"
 
-#: ../../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 "Pilih paket sendiri"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "Tunjukkan paket yang sudah dipilih secara otomatis"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Buka Tree"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Tutup Tree"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Togel tampilan rata dan terurut grupnya"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Ukuran total: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Paket Error"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nama: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Derajat: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Ukuran 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 ""
-"Kamu nggak bisa pilih paket ini sebab nggak ada ruang kosong untuk "
-"menginstallnya"
+"Anda tak bisa pilih paket ini sebab tak ada ruang kosong untuk menginstallnya"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Paket ini yang akan diinstall"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Paket berikut adalah yang akan dihapus"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
-msgstr "Anda nggak bisa pilih/buang paket ini"
+msgstr "Anda tak bisa pilih/buang paket ini"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
-msgstr "Paket ini harus diinstall, nggak bisa dibuang"
+msgstr "Paket ini harus diinstall, tak bisa dibuang"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
-msgstr "Anda nggak bisa buang paket ini, sebab dia sudah diinstall"
+msgstr "Anda tak bisa buang paket ini, sebab dia sudah diinstall"
 
-#: ../../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 ""
 "Paket ini mesti diupgrade\n"
-"Bener nggak mau dipilih?"
+"Benar tak mau dipilih?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
-msgstr "Kamu nggak bisa buang paket ini. dia mesti diupgrade"
+msgstr "Anda tak bisa buang paket ini. dia mesti diupgrade"
+
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Tunjukkan paket yang sudah dipilih secara otomatis"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "Muat/Simpan di floppy"
+
+#: ../../install_steps_gtk.pm_.c:461
+msgid "Updating package selection"
+msgstr "Update pilihan paket"
+
+#: ../../install_steps_gtk.pm_.c:466
+msgid "Minimal install"
+msgstr "Instalasi minimal"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Perkiraan"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Tunggu ya, saya sedang menyiapkan instalasi"
 
-#: ../../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"
@@ -4552,15 +4006,15 @@ msgstr ""
 "dan dilindungi oleh hukum hak cipta dan hak intelektual khusus untuk program "
 "komputer.\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 "Baiklah"
 
-#: ../../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 "Tolak"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4569,13 +4023,13 @@ msgid ""
 "done.\n"
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
-"Ganti CDROMnya!\n"
+"Ganti CDROM!\n"
 "\n"
-"Silahkan masukkan CDROM berlabel \"%s\" di drive Anda dan tekan OK\n"
-"Kalau Anda nggak punya CDROM ini, teken Batal aja untuk membatalkan "
-"instalasidari CD ini."
+"Silakan masukkan CDROM berlabel \"%s\" di drive Anda dan tekan OK\n"
+"Kalau Anda tak punya CDROM ini, tekan Batal aja untuk membatalkan instalasi "
+"dari CD ini."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Ada error saat menginstall paket"
 
@@ -4583,35 +4037,21 @@ msgstr "Ada error saat menginstall paket"
 msgid "An error occurred"
 msgstr "Ada error"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Pilih dulu bahasanya dong bow"
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr ""
-"Anda bisa pilih bahasa lain yang akan disediakan setelah install selesai"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Semuanya"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Persetujuan Lisensi"
 
-#: ../../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"
@@ -4665,7 +4105,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"
@@ -4702,7 +4142,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"
@@ -4839,103 +4279,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 "Keyboard"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
-msgstr "Pilih Keyboardmu"
+msgstr "Pilih keyboard Anda"
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "Ini adalah daftar keyboard yang tersedia"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Kelas Instal"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Kelas instalasi yang anda diinginkan?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Instal/Update"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Akan instal atau update?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Disarankan"
 
-#: ../../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 "Pakar"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Update"
 
-#: ../../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 "Tipe mouse yang anda punya?"
 
-#: ../../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 Mouse"
 
-#: ../../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 "Di serial port mana mouse Anda dicolokkan ?"
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "Emulasi tombol"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "Emulasi 2 tombol"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "Emulasi tombol 3"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Konfigurasikan card 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 "konfigurasi 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 "Tidak ada partisi"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Mendeteksi partisi untuk mencari lokasi mount"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Pilih lokasi mount"
 
-#: ../../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"
@@ -4945,109 +4381,147 @@ msgid ""
 "\n"
 "Do you agree to loose all the partitions?\n"
 msgstr ""
-"Saya nggak bisa baca tabel partisi, udah hancur lebur nih :(\n"
+"Saya tak bisa baca tabel partisi, udah hancur lebur nih :(\n"
 "Aku akan coba hapus partisi yg jeleknya (SEMUA DATA akan HILANG).\n"
 "Solusi lainnya adalah jangan biarkan saya memodifikasi tabel partisi.\n"
 "(pesan errornya adalah %s)\n"
 "\n"
 "Anda setuju untuk menghapus semua partisi?\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 gagal membaca tabel partisi Anda.\n"
-"Lanjutkan tapi resiko tanggung kendiri!"
+"Lanjutkan tapi resiko tanggung sendiri!"
+
+#: ../../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 ""
+"Tiada ruang 1MB utk bootstrap! Instal akan berlanjut, tetapi utk mem-boot "
+"sistem, Anda perlu membuat partisi bootstrap di DiskDrake"
+
+#: ../../install_steps_interactive.pm_.c:349
+msgid "No root partition found to perform an upgrade"
+msgstr "Tiada partisi root tertemukam utk upgrade"
 
-#: ../../install_steps_interactive.pm_.c:361
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Partisi root"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
-msgstr "Apa sih partisi root (/) di sistem ini?"
+msgstr "Manakah partisi root (/) di sistem Anda?"
 
-#: ../../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 "Anda harus reboot agar perubahan table partisi dapat berlaku"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Pilih partisi yang akan diformat"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
-msgstr "Periksa bad block ?"
+msgstr "Periksa bad blok?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Melakukan format partisi"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Membuat dan memformat file %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Instalasi tidak bisa diteruskan karena swap kurang, tambahin dong"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Sedang mencari paket yang tersedia"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Mencari paket untuk diupgrade"
 
-#: ../../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 ""
-"Waduh, sistem ini nggak punya cukup space untuk install atawa upgrade (%d > %"
-"d)"
+msgstr "Sistem ini tak punya cukup space untuk install atawa upgrade (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Lengkap (%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 "Disarankan (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Customized"
 
-#: ../../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 ""
+"Pilih muat/simpan seleksi paket di floppy.\n"
+"Formatnya sama dengan floppy buatan auto_install."
+
+#: ../../install_steps_interactive.pm_.c:525
+msgid "Load from floppy"
+msgstr "Muat dari floppy"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "Memuat dari floppy"
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "Pilihan paket"
+
+#: ../../install_steps_interactive.pm_.c:532
+msgid "Insert a floppy containing package selection"
+msgstr "Masukkan disket yg berisi seleksi paket"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Simpan di floppy"
+
+#: ../../install_steps_interactive.pm_.c:605
+msgid "Selected size is larger than available space"
+msgstr "Ukuran terpilih melebihi area yg ada"
+
+#: ../../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 ""
-"Kalau kamu punya semua CD pada daftar di bawah, tekan OK.\n"
-"Kalau nggak punya sama sekali, click Cancel.\n"
+"Kalau Anda punya semua CD pada daftar di bawah, tekan OK.\n"
+"Kalau tak punya sama sekali, click Cancel.\n"
 "Kalau cuma punya beberapa aja, pilih aja, trus klik Ok."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Label CD-ROM \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5056,11 +4530,21 @@ msgstr ""
 "Sedang instal paket %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Konfigurasi Instalasi akhir"
 
-#: ../../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 "Masukkan floppy boot ke drive %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Masukkan disket Update Modules ke drive %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -5122,98 +4606,138 @@ msgstr ""
 "didownload ini, setelah Anda dan/atau end user memiliki akses\n"
 "ke software tersebut setelah menandatangani perjanjian yang ada.\n"
 "\n"
-"Apabila ada pertanyaan mengenai perjanjian ini, silahkan hubungi\n"
+"Apabila ada pertanyaan mengenai perjanjian ini, silakan hubungi\n"
 "2400 N. Lincoln Avenue Suite 243\n"
 "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 "Pilih mirror tempat Anda ingin mengambil paket program"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Saya sedang mencek mirror untuk mengambil daftar paket yang tersedia"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Pilih paket yang akan diinstal"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Pilih timezone Anda"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "Apakah jam hardwarenya di set ke GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+msgid "Hardware clock set to GMT"
+msgstr "Jam hardware diset ke GMT"
+
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr "sinkronisasi waktu otomatis (dg NTP)"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "Server NTP"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "server CUPS remote"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Tidak ada printer"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Ringkasan"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Mouse"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../../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 "card ISDN"
+msgstr "kartu ISDN"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Sound Card"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "TV Card"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Sistem printer mana yang ingin digunakan?"
+#: ../../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 "File lokal"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Set password root"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Tak berpassword"
 
-#: ../../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 "Passwordnya terlalu mudah (harus paling tidak %d karakter)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Gunakan NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autentikasi"
+
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "Otentikasi LDAP"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "yellow pages"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr "Basis dn LDAP"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
-msgstr "Autentikasi NIS"
+#: ../../install_steps_interactive.pm_.c:951
+msgid "LDAP Server"
+msgstr "Server LDAP"
+
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
+msgstr "Otentikasi NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../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 "Server 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 "
@@ -5239,19 +4763,19 @@ msgstr ""
 "dengan image rescue Mandrake, yang memudahkan kita untuk merecover sistem\n"
 "dari kegagalan. Sekarang, saya mau tanya nih... mau bikin bootdisk nggak ?"
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Drive Disket Pertama"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Drive disket kedua"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Lewatkan"
 
-#: ../../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 "
@@ -5273,49 +4797,67 @@ msgstr ""
 "dengan image rescue Mandrake, yang memudahkan kita untuk merecover sistem\n"
 "dari kegagalan. Sekarang, saya mau tanya nih... mau bikin bootdisk nggak ?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
-msgstr "Wah maaf nih, nggak ada floppy drive yah ?"
+msgstr "Tiada floppy drive tersedia"
 
-#: ../../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 "Pilih drive floppy untuk membuat bootdisk"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Masukkan disket di drive %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Membuat bootdisk"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Membuat bootloader"
 
-#: ../../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 ""
+"Nampaknya Anda punya mesin DuniaLama/TakJelas.\n"
+"Bootloader yaboot takkan bekerja.\n"
+"Instal akan berlanjut, tapi Anda perlu memakai\n"
+"BootX utk mem-boot mesin Anda"
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
-msgstr "Mau pakai aboot saja?"
+msgstr "Ingin pakai 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?"
 msgstr ""
-"Wah ada error saat install aboot,\n"
-"Paksakan instalasi nggak walaupun nanti bisa merusak partisi awal?"
+"Ada error saat install aboot,\n"
+"paksakan instalasi walau merusak partisi awal?"
+
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Install bootloader"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Instalasi bootloader gagal. Ada kesalahan berikut:"
 
-#: ../../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 ""
@@ -5326,37 +4868,34 @@ msgstr ""
 "lalu ketikkan: shut-down\n"
 "Pada boot selanjutnya prompt bootloader akan ditampilkan deh."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Lemah"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Sedang"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Kuat"
 
-#: ../../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 "Pilih Tingkat Security"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "Mau buat disket auto install untuk replikasi 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 "Masukkan disket kosong di drive %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 "Lagi buat disket auto install"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5366,30 +4905,30 @@ msgstr ""
 "\n"
 "Anda ingin keluar sekarang?"
 
-#: ../../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 ""
-"Wah Selamat nih, instalasinya sudah komplit.\n"
-"Sekarang cabut media boot dan pencet tombol untuk reboot.\n"
+"Selamat, instalasi selesai.\n"
+"Sekarang cabut media boot dan pencet Return/Enter untuk reboot.\n"
 "Untuk informasi update program untuk rilis Linux Mandrake ini,\n"
-"silahkan lihat Errata di http://www.linux-mandrake.com/.\n"
+"silakan lihat Errata di http://www.linux-mandrake.com/.\n"
 "Informasi untuk konfigurasi sistem juga tersedia di \n"
 "bab Instalasi di Buku Petunjuk Resmi Linux Mandrake."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Buat floppy instalasi otomatis"
 
-#: ../../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"
@@ -5403,50 +4942,67 @@ msgstr ""
 "\n"
 "Mungkin Anda perlu mengulangi instalasinya.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Otomatis"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
-msgstr "Ulangi"
+msgstr "Ulang"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Simpan paket yang sudah dipilih"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Instalasi Linux-Mandrake %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Instalasi Linux Mandrake %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> untuk pindah | <Spasi> untuk pilih | <F12> Layar berikut"
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
-msgstr "kdesu hilang nih"
+msgstr "kdesu hilang"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Pilih maunya apa"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
-msgstr "Silahkan tunggu sebentar"
+msgstr "Tunggulah"
+
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Buka Tree"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Tutup Tree"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Togel tampilan rata dan terurut grupnya"
 
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
-msgstr "Tidak jelas (%s), coba yang lebih tepat\n"
+msgstr "Tak jelas (%s), coba lebih detil\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
 #: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
-msgstr "Pilihan salah, silahkan ulangi\n"
+msgstr "Pilihan salah, silakan ulangi\n"
 
 #: ../../interactive_stdio.pm_.c:39
 #, c-format
@@ -5463,267 +5019,288 @@ msgstr "Pilihan anda? (default %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Pilihan anda? (default %s  pilih 'none' untuk tidak ada) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "Ceko (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 "Jerman"
 
-#: ../../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 "Spanyol"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Finland"
 
-#: ../../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 "Perancis"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norwegia"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Polandia"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Rusia"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Swedia"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Keyboard 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 "Keyboard US"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "Albania"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armenia (lama)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armenia (mesintik)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
-msgstr "Armenia (phonetic)"
+msgstr "Armenia (fonetik)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaijan (latin)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaijan (cyrillic)"
-
-#: ../../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 "Brazilia"
+msgstr "Brazil (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Belarusia"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
-msgstr "Swiss (layout Jerman)"
+msgstr "Swis (layout Jerman)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
-msgstr "Swiss (layout Perancis)"
+msgstr "Swis (layout Prancis)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "Ceko (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "Ceko (Programmer)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Jerman (tanpa dead key)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Denmark"
 
-#: ../../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 (Norwegia)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estonia"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgia (layout \"Rusia\")"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgia (layout \"Latin\")"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Yunani"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Hungaria"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Kroasia"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Ibrani"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
-msgstr "Ibrani (Phonetic)"
+msgstr "Ibrani (fonetik)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iran"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Islandia"
 
-#: ../../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 "Jepang 106 tombol"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Keyboard Korea"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Amerika Latin"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Macedonia"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Belanda"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lithuania AZERTY (lama)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lithuania AZERTY (baru)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lithuania \"number row\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lithuania \"phonetic\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Lokasi"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Macedonia"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Belanda"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Polandia (layout qwerty)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Polandia (layout qwertz)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugis"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "Romanian (qwertz)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "Romanian (qwerty)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "Rusia (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Swedia"
-
-#: ../../keyboard.pm_.c:195
+#: ../../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 (Programmer)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbaijan (cyrillic)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Keyboard Thailand"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Keyboard Thailand"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turki (model \"F\" tradisional)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turki (model \"Q\" modern)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukrania"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "Keyboard US (internasional)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnam \"numeric row\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Yugoslavia (latin/cyrillic)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Mount melingkar %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Hapus dulu volume logiknya\n"
 
@@ -5733,7 +5310,7 @@ msgstr "Mouse Sun"
 
 #: ../../mouse.pm_.c:31
 msgid "Standard"
-msgstr "Standard"
+msgstr "Standar"
 
 #: ../../mouse.pm_.c:32
 msgid "Logitech MouseMan+"
@@ -5829,176 +5406,233 @@ msgstr "3 tombol"
 
 #: ../../mouse.pm_.c:72
 msgid "none"
-msgstr "tidak ada"
+msgstr "tiada"
 
 #: ../../mouse.pm_.c:74
 msgid "No mouse"
 msgstr "Tidak pakai mouse"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Silakan di test mousenya"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Untuk mengaktifkan mouse,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "gerakan rodanya!"
+
+#: ../../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 "Selesai"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Lanjutkan ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Tahap sebelumnya"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Apa sudah sesuai?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Konfigurasi Internet"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Hubungan ke Internet"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Anda ingin test koneksi Internetnya sekarang?"
+#: ../../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 ""
+"Cara yang umum untuk terkoneksi ke adsl adalah dengan menggunakan pppoe.\n"
+"Namun ada juga yang menggunakan pptp, dan ada yang pakai dhcp saja.\n"
+"Bila ragu, pilih saja 'gunakan pppoe'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Testing koneksi ini..."
+#: ../../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 "Sistem ini sekarang terhubung ke Internet."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "gunakan dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Untuk alasan keamanan, sekarang akan diputus koneksinya"
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "gunakan pppoe"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "gunakan 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 ""
-"Sistem ini sepertinya tidak terhubung ke Internet deh.\n"
-"Cobalah konfigurasikan ulang koneksinya."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Konfigurasi Jaringan"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "konfigurasi ISDN"
+"Klien dhcp mana yang ingin Anda pakai?\n"
+"defaultnya adalah 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 ""
-"Pilih provider Anda.\n"
-"Bila tidak ada dalam daftar, pilih Tidak Terdaftar"
+"Tidak ada adapter jaringan ethernet yang terdeteksi di sistem ini.\n"
+"Saya jadinya tidak dapat mengkonfigurasikan tipe koneksi ini deh."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Konfigurasi Koneksi"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Pilih interface jaringan"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Silakan isi atau cek kolom berikut"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "Pilih adapter jaringan yang akan digunakan untuk terhubung ke Internet"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ card"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "Tidak ada card network ya?"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Mem card (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Konfigureasi jaringan"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "IO Card"
+#: ../../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 ""
+"Masukkan nama komputernya karena ada server DHCP yang mengharuskan adanya "
+"hostname ini.\n"
+"Hostname (nama komputer) sebaiknya merupakan nama host yg fully-qualified\n"
+"misalnya ``samson.ciawi.mdamt.net''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "IO_0 card"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Nama Host"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "IO_1 card"
+#: ../../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 "Wizard Konfigurasi Jaringan"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Nomor telepon Anda"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Modem ISDN external"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Nama provider (misalnya provider.net.id)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "card ISDN Internal"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Nomor telepon provider"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Tipe koneksi ISDN apa yang Anda miliki?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "DNS Provider 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 ""
+"Konfigurasi ISDN mana yg Anda suka?\n"
+"\n"
+"* Konfigurasi lama menggunakan isdn4net, berisi alat perkasa,\n"
+"  tetapi tricky bagi pemula, dan tidak standar.\n"
+"\n"
+"* Konfigurasi baru lebih mudah dimengerti, lebih standar,\n"
+"  tapi dg alat lebih sedikit.\n"
+"\n"
+"Kami sarankan konfigurasi ringan.\n"
+"\n"
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "DNS Provider 2"
+#: ../../network/isdn.pm_.c:54
+msgid "New configuration (isdn-light)"
+msgstr "Konfigurasi baru (isdn-light)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "mode dial"
+#: ../../network/isdn.pm_.c:54
+msgid "Old configuration (isdn4net)"
+msgstr "Konfigurasi lama (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Login Account (username)"
+#: ../../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 "konfigurasi ISDN"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Password Account"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Pilih provider Anda.\n"
+"Bila tidak ada dalam daftar, pilih Tidak Terdaftar"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Eropa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Protokol Boot"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Eropa (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 "Tempat-tempat lain"
 
-#: ../../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 ""
 "Tempat-tempat lain \n"
-" tidak pakai D-Channel (leased lines)"
+" tanpa D-Channel (leased lines)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Protokol apa yang ingin Anda gunakan?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Tipe card mana yang anda punya?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
-msgstr "Duh, saya tidak tahu"
+msgstr "Saya tak tahu"
 
-#: ../../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"
@@ -6012,19 +5646,19 @@ msgstr ""
 "Bila Anda punya card PCMCIA, Anda harus mengetahui irq dan io card Anda "
 "itu.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
-msgstr "Batalkan"
+msgstr "Batal"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
-msgstr "Lanjutkan"
+msgstr "Lanjut"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
-msgstr "manakah card ISDN yang Anda punya?"
+msgstr "Manakah card ISDN Anda?"
 
-#: ../../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."
@@ -6032,107 +5666,59 @@ msgstr ""
 "Saya mendeteksi adanya sebuah card ISDN PCI, tapi saya tidak tahu tipenya. "
 "Silakan pilih card PCI tersebut pada layar berikutnya."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
-msgstr ""
-"Saya tidak menemukan card ISDN PCI. Silakan pilih satu pada layar berikutnya."
-
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Tidak ada adapter jaringan ethernet yang terdeteksi di sistem ini.\n"
-"Saya jadinya tidak dapat mengkonfigurasikan tipe koneksi ini deh."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Pilih interface jaringan"
+msgstr "Tiada kartu PCI ISDN ditemukan. Pilihlah satu pd layar berikut."
 
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr "Pilih adapter jaringan yang akan digunakan untuk terhubung ke Internet"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Interface jaringan"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Setuju?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Saya akan merestart device jaringan ini:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "konfigurasi ADSL"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Anda mau jalankan koneksi ini saat boot?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
-msgstr "Di serial port mana modem Anda disambungkan?"
+msgstr "Di serial port mana modem Anda terhubung?"
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Parameter Dialup"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Nama koneksi"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Nomor telepon"
 
-#: ../../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 "Autentikasi"
+#: ../../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-based"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Terminal-based"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Nama domain"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Server DNS Primary (boleh diisi/tidak)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Server DNS Sekondari (boleh tidak diisi)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "Saya akan merestart device jaringan $netc->{NET_DEVICE}. Setuu?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6140,7 +5726,7 @@ msgstr ""
 "\n"
 "Anda bisa putuskan atau konfigurasi koneksi yang ada sekarang."
 
-#: ../../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."
@@ -6148,11 +5734,11 @@ msgstr ""
 "\n"
 "Anda bisa mengkonfigurasikan ulang koneksi ini"
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Sekarang Anda sedang terhubung ke Internet."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -6160,102 +5746,56 @@ msgstr ""
 "\n"
 "Anda bisa sambungkan koneksi ke Internet atau mengkonfigurasikan ulang."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Anda sedang tidak terhubung ke Internet."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Sambungkan koneksi Internet"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Putuskan koneksi Internet"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Konfigureasikan koneksi jaringan (LAN atau Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Koneksi dan konfigurasi Internet"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Wizard Konfigurasi Jaringan"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Modem ISDN external"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "card ISDN Internal"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Tipe koneksi ISDN apa yang Anda miliki?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Hubungan ke 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 ""
-"Cara yang umum untuk terkoneksi ke adsl adalah dengan menggunakan pppoe.\n"
-"Namun ada juga yang menggunakan pptp, dan ada yang pakai dhcp saja.\n"
-"Bila ragu, pilih saja 'gunakan pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "gunakan dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "gunakan pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "gunakan 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 "Sekarang saya mau restart device jaringan %s. Setuju ?"
-
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
-msgstr ""
-"Klien dhcp mana yang ingin Anda pakai?\n"
-"defaultnya adalah dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "Konfigurasi Jaringan"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Anda ingin restart konfigurasi ini?"
+msgid "We are now going to configure the %s connection."
+msgstr "Kita akan mengkonfigurasi koneksi %s."
 
-#: ../../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 ""
-"Problem terjadi saat restart netword:\n"
 "\n"
-"%s"
+"\n"
+"\n"
+"Konfigurasi koneksi %s.\n"
+"\n"
+"\n"
+"Tekan OK utk mulai."
+
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Konfigurasi Jaringan"
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6264,9 +5804,9 @@ msgid ""
 msgstr ""
 "Jaringan Anda sudah terkonfigurasi lho\n"
 "Silakan klik OK untuk rekonfigurasi ulang koneksi jaringan/internet ini, "
-"atau batal bilaAnda berubah pikiran.\n"
+"atau batal jika Anda berubah pikiran.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6277,74 +5817,116 @@ msgstr ""
 "\n"
 "Sekarang kita akan mengkonfigurasikan internet/jaringan.\n"
 "Bila Anda tidak mau menggunakan deteksi otomatis, mohon untuk tidak memilih "
-"pada checkboxnya.\n"
+"checkbox.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Pilih profil yang hendak Anda konfigurasikan"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
-msgstr "Gunakan auto detek"
+msgstr "Gunakan deteksi otomatis"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Mendeteksi alat..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Konfigurasi koneksi modem biasa "
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "dideteksi pada port %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "Konfigurasi koneksi ISDN"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "%s telah terdeteksi"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "Konfigurasi koneksi DSL (atau ADSL)"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+msgid "ADSL connection"
+msgstr "Koneksi ADSL"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "telah dideteksi ada pada interface %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Konfigurasi jaringan kabel"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "Koneksi kabel terdeteksi"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "konfigurasi LAN"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "ada ethernet card yang terdeteksi"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Pilih cara yang Anda inginkan untuk terhubung ke Internet"
+#: ../../network/netconnect.pm_.c:190
+msgid "Choose the connection you want to configure"
+msgstr "Pilih koneksi yg hendak dikonfigurasi"
+
+#: ../../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 ""
+"Anda mengkonfigurasi bbrp jalan utk koneksi Internet.\n"
+"Pilih yg ingin Anda pakai.\n"
+"\n"
+
+#: ../../network/netconnect.pm_.c:215
+msgid "Internet connection"
+msgstr "Koneksi Internet"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Anda mau jalankan koneksi ini saat boot?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Konfigurasi Jaringan"
+
+#: ../../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 ""
+"A problem occured while restarting the network: \n"
+"\n"
+"%s"
+msgstr ""
+"Problem terjadi saat restart netword:\n"
+"\n"
+"%s"
+
+#: ../../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 ""
 "Selamat deh., jaringan dan internet telah dikonfigurasikan.\n"
 "\n"
-"Konfigurasi yang tadi telah dilakukan sekarang akan dijalankan di sistem ini."
+"Konfigurasi yang tadi telah dilakukan sekarang akan dijalankan di sistem "
+"ini.\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."
@@ -6352,31 +5934,7 @@ msgstr ""
 "Setelah itu, silakan restart X Anda agar bebas dari masalah pergantian\n"
 "nama host."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "Tidak ada card network ya?"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Konfigureasi jaringan"
-
-#: ../../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 ""
-"Masukkan nama komputernya karena ada server DHCP yang mengharuskan adanya "
-"hostname ini.\n"
-"Hostname (nama komputer) sebaiknya merupakan nama host yg fully-qualified\n"
-"misalnya ``samson.ciawi.mdamt.net''."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Nama Host"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6389,7 +5947,7 @@ msgstr ""
 "Bila ingin menggantinya, silakan ganti isi pada kolom-kolom di konfigurasi "
 "ini."
 
-#: ../../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"
@@ -6399,38 +5957,38 @@ msgstr ""
 "Tiap item harus diberikan sebagai alamat IP dalam notasi decimal\n"
 "bertitik (misalnya 202.159.35.32)."
 
-#: ../../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 "Konfigurasi perangkat jaringan %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (driver $module)"
+#: ../../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 "Alamat IP"
 
-#: ../../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 "IP otomatis"
 
-#: ../../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 "Alamat IP harus dalam 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"
@@ -6442,43 +6000,149 @@ msgstr ""
 "misalnya ``mdamt.fdns.net''.\n"
 "Anda juga bisa masukkan alamat IP gatewaynya kalau ada"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "Server DNS"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Device Gateway"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Konfigurasi proxy"
 
-#: ../../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 "Proxy biasanya http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Proxy biasanya ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Konfigurasi Internet"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Anda ingin tes koneksi Internet sekarang?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Testing koneksi ini..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Sistem ini sekarang terhubung ke Internet."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Untuk alasan keamanan, sekarang akan diputus koneksinya"
+
+#: ../../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 ""
+"Sistem ini sepertinya tidak terhubung ke Internet deh.\n"
+"Cobalah konfigurasikan ulang koneksinya."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Konfigurasi Koneksi"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Silakan isi atau cek kolom berikut"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ card"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Mem card (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "IO Card"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "IO_0 card"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "IO_1 card"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Nomor telepon Anda"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Nama provider (misalnya provider.net.id)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Nomor telepon provider"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "DNS Provider 1 (boleh diisi boleh tidak)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "DNS Provider 2 (boleh diisi boleh tidak)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Pilih keyboard"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "mode dial"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+msgid "Connection speed"
+msgstr "Laju koneksi"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Waktu koneksi: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Login Account (username)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Password Account"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
-msgstr "Partisi extended nggak bisa dipakai di platform ini"
+msgstr "Partisi extended tak bisa dipakai di platform ini"
 
-#: ../../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 "
@@ -6488,26 +6152,21 @@ msgstr ""
 "Satu-satunya cara adalah memindahkan partisi primary Anda ke partisi\n"
 "extended selanjutnya"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Error saat membaca file %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Proses restore dari file %s gagal: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "File backup rusak"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Error pada saat menulis file %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"
@@ -6535,51 +6194,216 @@ msgstr "bagus"
 
 #: ../../pkgs.pm_.c:28
 msgid "maybe"
-msgstr "yaah..gimana yaa"
+msgstr "hmm.."
+
+#: ../../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:20
+#: ../../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 lokal"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "printer remote"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "server CUPS remote"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Server lpd remote"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Printer jaringan (socket)"
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
-msgstr "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 "Server Printer"
 
-#: ../../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 "Device Printer URI"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+#, fuzzy
+msgid "Pipe job into a command"
+msgstr "Pipe ke perintah"
+
+#: ../../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 "Pilih koneksi Printer"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Bagaimana printer ini disambung ke komputer?"
+
+#: ../../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 ""
+"Dengan server CUPS remote, Anda tidak perlu mengkonfigurasikan\n"
+"printer di sini; printer akan secara otomatis dideteksi.\n"
+"Bila ragu, pilih saja \"server CUPS Remote\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+#, fuzzy
+msgid "None"
+msgstr "Selesai"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Pilih user default:"
+
+#: ../../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 "Tutup"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "printer remote"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "Alamat IP harus dalam format 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Nomor port harus berupa angka"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Printer lokal"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "IP server CUPS"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Konfigurasi Tipe Boot"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Mendeteksi alat..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
-msgstr "Test port"
+msgstr "Tes port"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Printer dengan tipe \"%s\" telah terdeteksi di "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Alat printer lokal"
 
-#: ../../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"
@@ -6587,37 +6411,59 @@ msgstr ""
 "Device mana yang terhubung ke printer\n"
 "(ingat, /dev/lp0 = LPT1:) ?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Device Printer"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr "Nama device/file hilang!"
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "Saya sedang membaca database driver CUPS..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Pilihan printer lpd remote"
 
-#: ../../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 ""
 "Untuk dapat mencetak ke antrian lpd remote, Anda perlu\n"
 "tuliskan nama host server printer dan nama antrian\n"
-"yang digunakan untuk mencetak di server itu."
+"di server itu."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "Nama Host Remote"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Antrian remote"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "printer remote"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:320
+msgid "Remote host name missing!"
+msgstr "Nama host remote hilang!"
+
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Nama host remote hilang!"
+
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
-msgstr "Pilihan printer SMB (Windows 95/NT)"
+msgstr "Pilihan printer SMB (windows 95/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"
@@ -6631,29 +6477,37 @@ msgstr ""
 "dan juga nama share printer tersebut, oh iya...\n"
 "nama user, password, dan info workgroupnya juga."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "Host server SMB"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP server SMB"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Nama share"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Workgroup"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr "Harus ada nama/IP server!"
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr "Nama share Samba hilang!"
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "Pilihan printer 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."
@@ -6663,298 +6517,829 @@ msgstr ""
 "dengan nama TCP/IPnya lho) juga nama antrian printer yang \n"
 "Anda ingin gunakan beserta nama user dan passwordnya."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Server Printer"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Nama antrian printer"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr "Nama server NCP hilang!"
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr "Nama antrian NCP hilang!"
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Pilihan printer 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 ""
 "Untuk mencetak ke printer soket, Anda perlu menuliskan\n"
 "hostname printer itu dan juga nomor portnya."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Hostname Printer"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Port"
+#: ../../printerdrake.pm_.c:537
+msgid "Printer host name missing!"
+msgstr "Nama host printer hilang!"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Device Printer URI"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Anda bisa memasukan URI untuk mengakses printer dengan 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 ""
+"Anda dapat menset langsung URI utk akses printer. URI harus memenuhi "
+"spesifikasi CUPS/Foomatic. Ingat, tak semua tipe URI di-support oleh semua "
+"spooler."
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
-msgstr "Tipe printer yang anda inginkan?"
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr "Harus diisi URI valid!"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "Anda ingin test cetak?"
+#: ../../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 ""
+"Tiap printer perlu nama (misal: lp).\n"
+"Kolom Penjelasan / Lokasi tak harus terisi.\n"
+"Itu komentar utk user."
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
-msgid "Printing test page(s)..."
-msgstr "Saya sedang test cetak..."
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Nama Printer"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Keterangan"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Lokasi"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Saya sedang membaca database driver CUPS..."
+
+#: ../../printerdrake.pm_.c:793
+msgid "Printer model selection"
+msgstr "Seleksi model printer"
+
+#: ../../printerdrake.pm_.c:794
+msgid "Which printer model do you have?"
+msgstr "Anda punya model printer mana?"
 
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:324
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Konfigurasi 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 "Konfigurasi 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
+#, fuzzy, c-format
+msgid "Option %s must be an integer number!"
+msgstr "Port harus berupa integer"
+
+#: ../../printerdrake.pm_.c:1094
+#, fuzzy, c-format
+msgid "Option %s must be a number!"
+msgstr "Port harus berupa integer"
+
+#: ../../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 "Ingin tes cetak?"
+
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Tes port"
+
+#: ../../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 "Ya, Test cetak postscript dan text ascii"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Printer"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Tool Standard"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Saya sedang tes cetak..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Saya sedang tes cetak..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
+msgid "Printing test page(s)..."
+msgstr "Saya sedang tes cetak..."
+
+#: ../../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 ""
 "Halaman test telah dikirim ke daemon printer.\n"
 "Akan butuh waktu sebentar untuk mulai mencetak.\n"
 "Status cetak:\n"
 "%s\n"
 "\n"
-"Bisa tercetak nggak?"
+"Tercetak baik?"
 
-#: ../../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 ""
 "Halaman test telah dikirim ke daemon printer.\n"
 "Akan butuh waktu sebentar untuk mulai mencetak.\n"
-"Bisa tercetak nggak?"
+"Tercetak baik?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Ya, Test cetak ascii"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Ya, Test cetak postscript"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Tidak ada printer"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Ya, Test cetak postscript dan text ascii"
+#: ../../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 "Konfigurasi 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"
-msgstr "Parameter printer"
+#: ../../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 "Matikan Jaringan"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Ukuran Kertas"
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
+msgstr "Opsi printer"
+
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "Saya sedang membaca database driver CUPS..."
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Kertas di eject habis ngeprint?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Konfigurasi Internet"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Parameter driver 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 "Pilihan kedalaman warna"
+#: ../../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 "Cetak text dalam 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 "Betulkan efek tangga pada teks ?"
+#: ../../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 "Jumlah halaman per output"
+#: ../../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 "Margin Kiri/Kanan dalam point (1/72 inci)"
+#: ../../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 "Margin Atas/Bawah dalam point (1/72 inci)"
+#: ../../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 "Extra option pada GhostScript"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Pilihan text extra"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Balikkan urutan halaman"
+#: ../../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 "Anda ingin konfigurasikan printer?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "Nama printer harus hanya berupa huruf, angka, atau garisbawah"
 
-#: ../../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 "Tidak ada printer"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
 msgstr ""
-"Ini adalah antrian print\n"
-"Anda boleh tambahkan atau mengubah yang sudah ada."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS dijalankan"
+#: ../../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 "Saya sedang membaca database driver CUPS..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Pilih koneksi Printer"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "konfigurasi Lilo/Grub"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Bagaimana printer ini disambung ke komputer?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Mulai koneksi..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Pilih koneksi Printer remote"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Konfigurasi jaringan"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitor tidak dikonfigurasi"
+
+#: ../../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 ""
-"Dengan server CUPS remote, Anda tidak perlu mengkonfigurasikan\n"
-"printer di sini; printer akan secara otomatis dideteksi.\n"
-"Bila ragu, pilih saja \"server CUPS Remote\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Konfigureasi jaringan"
+
+#: ../../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 ""
-"Dengan server CUPS remote, Anda tidak perlu mengkonfigurasikan\n"
-"printer di sini; printer nantinya akan secara otomatis dideteksi\n"
-"kecuali servernya ada di jaringan lain; dalam hal ini, Anda perlu\n"
-"memasukan alamat IP server CUPS itu dan nomor portnya kalau ada."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "IP server 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 "Nomor port harus berupa angka"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Sistem printer mana yang ingin digunakan?"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Kuat"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Pengecut"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Hapus Antrian"
+#: ../../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"
-msgstr "Nama printer haruslah berupa huruf, angka, dan 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 "Sistem printer mana yang ingin digunakan?"
+
+#: ../../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 ""
-"Tiap antrian cetak harus punya nama (biasanya lp).\n"
-"Parameter lain seperti keterangan dan lokasi printer bisa ditambahkan.\n"
-"Sekarang saya mau tanya,\n"
-"nama printer yang digunakan ini apa yah ?\n"
-"Juga saya mau tanya bagaimana printernya disambungkan ke situ?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Nama Printer"
+#: ../../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 "Keterangan"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Lokasi"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+msgid "Select Printer Spooler"
+msgstr "Pilih spooler printer"
+
+#: ../../printerdrake.pm_.c:1728
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Sistem (spooler) printer mana yang ingin digunakan?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Konfigurasi Printer"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Opsi printer"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Saya sedang membaca database driver CUPS..."
+
+#: ../../printerdrake.pm_.c:1845
+msgid "Would you like to configure printing?"
+msgstr "Ingin konfigurasi printer?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
+msgid ""
+"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 ""
+
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Modus normal"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Default)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "server CUPS remote"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "server CUPS remote"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+msgid "Add printer"
+msgstr "Tambah printer"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Anda ingin test konfigurasi ini?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Konfigurasi 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 "Koneksi Internet"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
+msgstr "Seleksi model printer"
+
+#: ../../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 "Saya sedang tes cetak..."
+
+#: ../../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 "printer remote"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Saya sedang membaca database driver 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 "Anda ingin restart konfigurasi ini?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Saya sedang membaca database driver CUPS..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "Konfigurasi 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 ""
+"Selamat datang di konfigurator proxy.\n"
+"\n"
+"Anda dapat mengeset proxy http/ftp dengan/tanpa login dan katakunci\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 "Isilah info proxy http, kosongkan jika tak perlu"
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr "URL"
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+msgid "port"
+msgstr "port"
+
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "Url harus berformat 'http:'"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "Bagian port harus berupa angka"
+
+#: ../../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 "Isilah info proxy ftp, kosongkan jika tak perlu"
+
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "Url harus berformat 'ftp:'"
+
+#: ../../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 ""
-"Tiap antrian cetak harus punya nama (biasanya lp) dan direktori spool\n"
-"yang dialokasikan untuknya. Sekarang saya mau tanya,\n"
-"nama antrian dan direktori yang digunakan apa yah ?\n"
-"Juga saya mau tanya bagaimana printernya disambungkan ke situ?"
+"Ketik login proxy dan katakuncinya, jika ada.\n"
+"Biarkan kosong jika tak ingin login/passwd"
+
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "login"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Nama Antrian"
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "katakunci"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Direktori spool"
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "tulis lagi katakunci"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "Koneksi Printer"
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "Katakunci tak sama, coba lagi!"
 
-#: ../../raid.pm_.c:33
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Tidak dapat menambah partisi ke RAID md%d yang terformat"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Tidak bisa menulis ke file $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Tidak bisa menulis ke file %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid gagal"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid gagal (mungkin raidtoolsnya nggak ada?)"
+msgstr "mkraid gagal (mungkin raidtoolsnya tak ada?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Partisi tidak cukup untuk level RAID %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr ""
+msgstr "Luncurkan sistem suara ALSA (Advanced Linux Sound Architecture)"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Skeduler command periodik, 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."
@@ -6962,7 +7347,7 @@ msgstr ""
 "apmd digunakan untuk monitoring status batere dan mencatatnya di syslog.\n"
 "apmd juga bisa untuk mematikan mesin waktu baterenya habis."
 
-#: ../../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."
@@ -6971,7 +7356,7 @@ msgstr ""
 "saat at dijalankan, dan memulai perintah secara batch waktu rata-rata load\n"
 "sedang rendah."
 
-#: ../../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 "
@@ -6983,7 +7368,7 @@ msgstr ""
 "dari cron UNIX biasa, termasuk pembenahan sekuriti yang lebih baik dan\n"
 "lebih mantapnya option pada konfigurasinya."
 
-#: ../../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 "
@@ -6995,13 +7380,15 @@ msgstr ""
 "konsol\n"
 "dan juga bikin menu pop-up di konsol."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
+"HardDrake mendeteksi hardware, dan mengkonfigurasi yg baru/berubah bila "
+"perlu."
 
-#: ../../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."
@@ -7009,7 +7396,7 @@ msgstr ""
 "Apache adalah server World Wide Web. Dia dipakai untuk menyediakan file\n"
 "HTML dan 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 "
@@ -7023,13 +7410,15 @@ msgstr ""
 "atas banyak server, misalnya telnet, ftp, rsh, dan rlogin. Menonaktifkan\n"
 "inetd berarti menonaktifkan semua servis-servis tadi."
 
-#: ../../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 ""
+"Luncurkan filter paket Linux kernel seri 2.2, untuk set-up\n"
+"firewall yang melindungi mesin Anda dari serangan network."
 
-#: ../../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"
@@ -7039,23 +7428,26 @@ msgstr ""
 "/etc/sysconfig/keyboard. Mapnya bisa dipilih dari utility kbdconfig.\n"
 "Mending Anda aktifkan aja deh ini."
 
-#: ../../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 ""
+"Regenerasi otomatis header kernel di /boot utk\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 "Deteksi dan konfigurasi otomatis hardware saat boot."
 
-#: ../../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 kadang bekerja keras saat boot utk perawatan konfigurasi sistem."
 
-#: ../../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)."
@@ -7063,13 +7455,15 @@ msgstr ""
 "lpd adalah daemon printer yang jadi tulang punggung lpr. Dia\n"
 "bertugas sebagai server yang memberi perintah kepada printer untuk mencetak."
 
-#: ../../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 Server, digunakan utk membangun server dg performans dan\n"
+"kapasitas tinggi."
 
-#: ../../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."
@@ -7077,15 +7471,15 @@ msgstr ""
 "named (BIND) adalah Domain Name Server (DNS) yang digunakan untuk\n"
 "menterjemahkan nama host ke IP address."
 
-#: ../../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 ""
 "Mount dan unmount semua Network File System (NFS), SMB (Lan\n"
-"Manager/Windows), dan NCP (Netware)."
+"Manager/windows), dan NCP (Netware)."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -7093,7 +7487,7 @@ msgstr ""
 "Aktif/nonaktifkan semua interface network yang terkonfigurasi nyala\n"
 "pada saat boot."
 
-#: ../../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"
@@ -7104,7 +7498,7 @@ msgstr ""
 "menggunakan\n"
 "konfigurasi pada file /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."
@@ -7112,17 +7506,17 @@ msgstr ""
 "NFS adalah protokol populer untuk file sharing di TCP/IP\n"
 "Servis ini memberikan fungsi file lock pada NFS."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
-msgstr ""
+msgstr "Secara otomatis nyalakan numlock saat boot pada console/XFree."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr ""
+msgstr "Support OKI 4w and winprinter kompatibel."
 
-#: ../../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 "
@@ -7131,10 +7525,10 @@ msgid ""
 msgstr ""
 "PCMCIA digunakan untuk menjalankan perangkat semacam ethernet atau modem "
 "pada laptop.\n"
-"Dia nggak bisa jalan kecuali dikonfigurasikan di sini, jadi nggak apa-apa\n"
-"kalau nggak diinstall di mesin yang nggak perlu PCMCIA."
+"Dia tak bisa jalan kecuali dikonfigurasikan di sini, jadi tak apa-apa\n"
+"kalau tak diinstall di mesin yang tak perlu PCMCIA."
 
-#: ../../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 "
@@ -7145,7 +7539,7 @@ msgstr ""
 "NFS dan NIS. Server portmap harus jalan di mesin yang bertindak sebagai\n"
 "server untuk protokol yang menggunakan mekanisme 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."
@@ -7153,7 +7547,7 @@ msgstr ""
 "Postfix adalah Mail Transport Agent yang berupa program yang bertugas\n"
 "mengantarkan surat dari suatu mesin ke mesin yang lain."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -7161,13 +7555,15 @@ msgstr ""
 "Menyimpan dan mengembalikan pool entropi sistem untuk membuat\n"
 "angka acak dengan kualitas sangat acak."
 
-#: ../../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 ""
+"Tunjuk raw device ke block devices (misalnya partisi hard drive),\n"
+"utk digunakan oleg aplikasi semacam 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"
@@ -7177,7 +7573,7 @@ msgstr ""
 "protokol RIP. RIP dipakai di jaringan kecil, dan semakin besar jaringannya\n"
 "maka protokol routing yang canggih pun semakin dibutuhkan."
 
-#: ../../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."
@@ -7185,7 +7581,7 @@ msgstr ""
 "Protokol rstat digunakan pada jaringan untuk mengambil\n"
 "ukuran kinerja sistem di network."
 
-#: ../../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."
@@ -7193,7 +7589,7 @@ msgstr ""
 "Protokol ruser digunakan di jaringan untuk mengidentifikasi siapa\n"
 "yang lagi login di jaringan."
 
-#: ../../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)."
@@ -7201,12 +7597,11 @@ msgstr ""
 "Protokol rwho digunakan untuk melihat daftar user yang sedang login\n"
 "di suatu sistem yang juga menjalankan daemon rwho (mirip dengan finger)."
 
-#: ../../services.pm_.c:85
-#, fuzzy
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
-msgstr "Jalankan X-Window saat sistem dimulai"
+msgstr "Aktifkan sistem suara"
 
-#: ../../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."
@@ -7214,32 +7609,68 @@ msgstr ""
 "Syslog adalah fasilitas yang digunakan para daemon untuk mencatat\n"
 "pesan log sistem di file. Hidupkan aja deh syslognya."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
-msgstr ""
+msgstr "Muat driver piranti USB"
 
-#: ../../services.pm_.c:89
-#, fuzzy
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Menghidupkan dan mematikan Server Font X saat boot dan mati."
+msgstr "Aktifkan Server Font X (agar XFree dapat berjalan)"
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Pilih service mana yang hendak dijalankan saat boot scr otomatis"
 
+#: ../../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 "mode sistem"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Pilihan printer lpd remote"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Server, Database"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+msgid "Services"
+msgstr "servis"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "sedang jalan"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "dihentikan"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Services dan daemon"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -7247,27 +7678,83 @@ msgstr ""
 "Mohon maaf, informasi lengkap\n"
 "tentang layanan ini tidak tersedia."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "Saat boot"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Sedang instal paket %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"
 msgstr ""
-"Saya nggak bisa baca tabel partisi, udah hancur lebur nih :(\n"
+"Saya tak bisa baca tabel partisi, udah hancur lebur nih :(\n"
 "Aku akan coba hapus partisi yg jeleknya"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Ada Kesalahan"
+
+#: ../../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 "Konfigurasi Instalasi akhir"
+
+#: ../../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 "Konfigurasi Tipe 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 "Wah Selamat nih!"
+
+#: ../../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 Connection Sharing"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Internet Connection Sharing sudah aktif"
 
-#: ../../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"
@@ -7279,31 +7766,31 @@ msgstr ""
 "\n"
 "Apa yang ingin Anda lakukan?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "Matikan"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "Selesai"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "Konfigurasi ulang"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Server-server sedang dimatikan"
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Internet Connection Sharing telah dimatikan"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Internet Connection Sharing masih dimatikan"
 
-#: ../../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"
@@ -7315,27 +7802,19 @@ msgstr ""
 "\n"
 "Apa yang ingin Anda lakukan?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "Aktifkan"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "Server-server akan dinyalakan"
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Internet Connection Sharing sudah aktif"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Isi file konfigurasi tidak dapat dibaca"
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Config file tidak dikenal"
-
-#: ../../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 "
@@ -7351,21 +7830,21 @@ msgstr ""
 "Perhatikan: Anda mesti punya adapter jaringan untuk mensetup Local Area "
 "Network (LAN)."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interface %s (pakai 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 "Tidak ada adapter jaringan di sistem ini!"
 
-#: ../../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."
@@ -7374,6 +7853,10 @@ msgstr ""
 "Silakan jalankan tool konfigurasi hardware deh."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Interface jaringan"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7388,32 +7871,33 @@ msgstr ""
 "\n"
 "Apakah Anda mau melakukan setup Local Area Network untuk adapter itu?"
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
-"Silahkan pilih adapter jaringan yang hendak disambung ke Local Area Network "
+"Silakan pilih adapter jaringan yang hendak disambung ke Local Area Network "
 "Anda."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Awas, adapter jaringannya sudah dikonfigurasikan nih. Mau dikonfigurasikan "
 "ulang?"
 
-#: ../../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 ""
 "Ada konflik alamat yang potensial pada LAN yang ada pada konfigurasi "
-"sekarang di $_!\n"
+"sekarang di %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Saya mendeteksi adanya konfigurasi 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."
@@ -7421,23 +7905,20 @@ msgstr ""
 "Awas! Ada konfigurasi firewall yang sudah ada nih. Anda nanti perlu mengecek "
 "dan membetulkan dengan cara manual setelah instalasi."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Sedang membuat konfigurasi..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Mengkonfigurasikan skrip, menginstall software, menjalankan server..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Aduh, saya ada masalah saat menginstall paket $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Wah Selamat nih!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Aduh, saya ada masalah saat menginstall paket %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 "
@@ -7448,23 +7929,23 @@ msgstr ""
 "pada Local Area Network di tempat Anda, dengan menggunakan konfigurasi "
 "jaringan otomatis (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "Konfigurasi telah seleasi.Namun sekarang masih dimatikan."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "Konfigurasi telah selesai.Namun sekarang sudah aktif."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Internet Connection Sharing belum pernah dikonfigurasikan"
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Koneksi dan konfigurasi sharing Internet"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7479,84 +7960,82 @@ msgstr ""
 "\n"
 "Silakan pencet Konfigurasikan untuk mulai."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Konfigurasi Jaringan (adapter %d)"
 
-#: ../../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 "Hapus profil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Profil yang hendak dihapus:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Buat profil baru..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Beri nama profil yang hendak dibuat:"
+#: ../../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 "Nama Host: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Akses Internet"
 
-#: ../../standalone/draknet_.c:160
+#: ../../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 "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 "Tersambung"
 
-#: ../../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 "Belum tersambung"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Sambungkan..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Koneksi diputus"
 
-#: ../../standalone/draknet_.c:191
-#, fuzzy
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
-msgstr "Testing koneksi ini..."
+msgstr "Mulai koneksi..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
-msgstr "Tutup koneksi ini..."
+msgstr "Tutup koneksi..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7567,120 +8046,118 @@ msgstr ""
 "Cobalah lakukan secara manual sebagai root lalu ketikkan\n"
 "/etc/sysconfig/network-scripts/net_cnx_down"
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "Sistem ini sekarang diputus koneksinya"
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Konfigurasi Akses Internet..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "konfigurasi LAN"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adapter"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Driver"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interface"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+msgid "State"
+msgstr "Status"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Konfigurasi Local Area Network..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Modus normal"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Pasang"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Tunggu ya, sedang mengaktifkan konfigurasi"
 
-#: ../../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 ""
+"Tiada interface terkonfigurasi.\n"
+"Konfigurasi dulu dg meng-klik 'Configure'"
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "konfigurasi LAN"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
-msgstr "Adapeer %s: %s"
+msgstr "Adapter %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "Protokol Boot"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Dijalankan saat boot"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "Klien DHCP"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Matikan"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Aktif"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Aktifkan"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Aktif"
 
-#: ../../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 ""
+"Tiada koneksi internet.\n"
+"Buat dulu dg meng-klik 'Configure'"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "konfigurasi koneksi Internet"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "konfigurasi koneksi Internet"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Tipe koneksi"
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parameter"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "DNS Provider 1 (boleh diisi boleh tidak)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "DNS Provider 2 (boleh diisi boleh tidak)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Card Ethernet"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "Klien DHCP"
 
@@ -7690,11 +8167,11 @@ msgstr "Selamat Datang di Crackers"
 
 #: ../../standalone/draksec_.c:22
 msgid "Poor"
-msgstr "Lemah Buanget"
+msgstr "Lemah"
 
 #: ../../standalone/draksec_.c:26
 msgid "Paranoid"
-msgstr "Wah Sinting nih"
+msgstr "Pengecut"
 
 #: ../../standalone/draksec_.c:29
 msgid ""
@@ -7750,15 +8227,30 @@ msgstr ""
 "ditutup.\n"
 "Fitur sekuriti sekarang sudah maksimum."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Pilih Tingkat Security"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Pilih opsi 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 "Pilih Tingkat Security"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Pusat Kontrol"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Pilih tool yang hendak digunakan"
 
@@ -7768,105 +8260,32 @@ msgstr "cara pakai: keyboarddrake [--expert] [keyboard]\n"
 
 #: ../../standalone/keyboarddrake_.c:36
 msgid "Do you want the BackSpace to return Delete in console?"
-msgstr ""
-"Apakah Anda ingin membuat tombol BackSpace menjadi Delete di dalam konsol?"
+msgstr "Ingin membuat tombol BackSpace menjadi Delete dalam konsol?"
 
 #: ../../standalone/livedrake_.c:23
 msgid "Change Cd-Rom"
-msgstr "Ganti CDROMnya"
+msgstr "Ganti CDROM"
 
 #: ../../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 ""
-"Ganti CDROMnya!\n"
-"\n"
-"Silahkan masukkan CDROM Instalasi di drive Anda dan tekan OK\n"
-"Kalau Anda nggak punya CDROM ini, teken Batal aja untuk membatalkan "
-"instalasidari CD ini."
+"Masukkan CDROM Instalasi di drive Anda dan tekan OK\n"
+"Jika tak punya, tekan Batal untuk hindari upgrade live."
 
 #: ../../standalone/livedrake_.c:34
 msgid "Unable to start live upgrade !!!\n"
-msgstr "Aduh, saya tidak bisa menjalankan upgrade live nih !!!\n"
+msgstr "Gagal memulai upgrade live !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
-msgstr "tidak ada serial_usb\n"
+msgstr "tiada serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Emulasikan tombol ketiga?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Silakan di test mousenya"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "Monitoring Jaringan"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Statistik"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "Kecepatan Kirim"
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "Kecepatan Terima: "
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Tutup"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "Sambung koneksi Internet"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "Putuskan koneksi Internet"
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "koneksi Internet gagal diputus"
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "koneksi Internet selesai diputus"
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Koneksi selesai"
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"Koneksi gagal\n"
-"Silakan periksa konfigurasinya di Mandrake Control Center"
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "terkirim: "
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "diterima: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Tersambung"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Putus"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "konfigurasi firewall"
@@ -7897,22 +8316,89 @@ msgstr ""
 "\n"
 "Silakan tekan Konfigurasikan untuk mensetup firewall standar"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Pilih bahasa Anda"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Pilih kelas instalasi"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Deteksi hard disk"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Konfigurasi mouse"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Pilih keyboard"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Sekuriti"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Setup filesystem"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Melakukan format partisi"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Paket yang akan diinstal"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Instal sistem"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Tambahkan user"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Konfigurasi jaringan"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Konfigurasi service"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Membuat bootdisk"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Install bootloader"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Konfigurasi X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Keluar dari proses instal"
+
+#: ../../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 ""
 "konfigurator tinyfirewall\n"
 "\n"
-"Program ini mengkonfigurasikan firewall pribadi untuk sistem Linux Mandrake "
-"ini.\n"
-"Untuk membuat solusi firewall yang lebih bagus lagi, silakan coba\n"
+"Program ini mengkonfigurasi firewall pribadi sistem Linux Mandrake.\n"
+"Untuk membuat solusi firewall yang lebih baik, cobalah\n"
 "distribusi Mandrake Security 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"
@@ -7931,7 +8417,7 @@ msgstr ""
 "Anda bisa ubah konfigurasikan lagi kapan-kapan dengan menjalankan\n"
 "aplikasi ini lagi nantinya."
 
-#: ../../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"
@@ -7943,7 +8429,7 @@ msgstr ""
 "maka jawab saja TIDAK di sini\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"
@@ -7956,7 +8442,7 @@ msgstr ""
 "silakan jawab TIDAK.\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"
@@ -7970,7 +8456,7 @@ msgstr ""
 "telnet tidak dienkripsi loh -- jadi orang lain bisa mencuri password Anda\n"
 "saat telnet. SSH dienkripsi dan tidak bisa disadap."
 
-#: ../../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"
@@ -7981,7 +8467,7 @@ msgstr ""
 "Tapi ini sangatlah tidak aman sebagaimana dijelaskan pada layar sebelumnya.\n"
 "Ayo deh jawab TIDAK dan gunakan SSH saja.\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"
@@ -7994,7 +8480,7 @@ msgstr ""
 "oleh FTP bisa dicuri oleh cracker, karena FTP tidak diacak saat pertukaran "
 "password terjadi.\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"
@@ -8006,7 +8492,7 @@ msgstr ""
 "Selainnya, matikan saja deh.\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"
@@ -8018,7 +8504,7 @@ msgstr ""
 "umum.\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"
@@ -8027,9 +8513,9 @@ msgid ""
 msgstr ""
 "Wah, Anda pakai kernel 2.2 yah... Bila IP jaringan Anda diset sendiri\n"
 "oleh komputer di kantor atau rumah (secara dinamis)\n"
-"maka kita harus jawab YA di sini. Benar nggak demikian?\n"
+"maka kita harus jawab YA di sini. Benar tak demikian?\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"
@@ -8044,302 +8530,1614 @@ msgstr ""
 "sebelumnya.\n"
 "jawab TIDAK deh"
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
 "\n"
 "\n"
 msgstr ""
-"Konfigurasi selesai. Kita simpan ya?\n"
+"Konfigurasi tamat. Simpan perubahan ini ke disk?\n"
 "\n"
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Tidak bisa buka %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "error membuka file %s untuk ditulisi: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klien untuk berbagai protokol, termasuk ssh"
+msgid "Web/FTP"
+msgstr "Server, Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Development"
+msgid "Network Computer (client)"
+msgstr "Komputer Jaringan (klien)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Workstation"
+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 "Server, Firewall/Router"
+msgid "Office"
+msgstr "Aplikasi Perkantoran"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Pengelolaan Informasi Pribadi"
+msgid "Gnome Workstation"
+msgstr "Workstation Gnome"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Grafik"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Tool untuk Palm Pilot ataupun Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Workstation"
+msgstr "Workstation"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Komputer Jaringan (klien)"
+msgid "Firewall/Router"
+msgstr "Server, Firewall/Router"
+
+#: ../../share/compssUsers:999
+msgid "Domain Name and Network Information Server"
+msgstr "Nama Domain dan Server Info Network (NIS)"
+
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Program office: pengolah kata (kword, abiword), spreadsheet (kspread, "
+"gnumeric), viewer pdf,dsb"
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr "Tool untuk audio: player mp3 atau midi, mixer, dsb"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Komputer Internet"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Buku dan Howto untuk Linux dan Free Software"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Aplikasi Perkantoran"
+msgid "KDE Workstation"
+msgstr "Workstation KDE"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Komputer Multimedia"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, dsb"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Kumpulan tool untuk membaca dan mengirimkan email dan news (pine, mutt, "
-"tin..) dan untuk membrowse Web"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Librari, program, dan file include untuk pemrograman C dan C++"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Kumpulan tool untuk mail, news, web, transfer file, dan chat"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Database"
+msgstr "Server, Database"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Program untuk mengelola keuangan, misalnya gnucash"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server database PostgreSQL atau MySQL"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "Tools to ease the configuration of your computer"
+msgstr "Tools untuk memudahkan konfigurasi komputer."
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, SSH server"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Sound"
+
+#: ../../share/compssUsers:999
+msgid "Utilities"
+msgstr "Peralatan"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "Dokumentasi"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, dsb"
+msgid "Console Tools"
+msgstr "Tool untuk konsol"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Utiliti"
+msgid "Postfix mail server, Inn news server"
+msgstr "Server mail Postfix, server news Inn"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Internet station"
+msgstr "Komputer Internet"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Mode Grafis"
+msgid "Multimedia station"
+msgstr "Komputer Multimedia"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Sound"
+#, fuzzy
+msgid "Configuration"
+msgstr "konfigurasi LAN"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Program permainan: arcade, board, strategi, dsb"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Desktop Grafis tambahan (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Editor dan Player Video"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"The K Desktop Environment, environment grafis dasar dengan kumpulan tool-"
+"tool yang menyertainya"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Tool untuk konsol"
+msgid "Graphical Environment"
+msgstr "Mode Grafis"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Program untuk memainkan/mengedit suara dan video"
+msgid "Development"
+msgstr "Development"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Aplikasi untuk Ilmu pengetahuan"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache dan Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editor, shell, tool untuk file, terminal"
+msgid "Tools to create and burn CD's"
+msgstr "Tool untuk membuat dan memburn CD"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Buku dan Howto untuk Linux dan Free Software"
+msgid "Office Workstation"
+msgstr "Komputer kantoran"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Environment grafis dengan kumpulan aplikasi dan tool desktop yang mudah "
-"digunakan"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, dsb"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Graphics programs such as The Gimp"
+msgstr "Program Grafis, misalnya The Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Game"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Librari, program, dan file include untuk pemrograman C dan C++"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
 msgstr "Komputer Server Jaringan"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Program Grafis, misalnya The Gimp"
+msgid "Mail/Groupware/News"
+msgstr "Server, Mail/Groupware/News"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Komputer kantoran"
+msgid "Game station"
+msgstr "Game"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"The K Desktop Environment, environment grafis dasar dengan kumpulan tool-"
-"tool yang menyertainya"
+msgid "Video players and editors"
+msgstr "Editor dan Player Video"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Desktop Grafis tambahan (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafik"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Tool untuk membuat dan memburn CD"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Program permainan: arcade, board, strategi, dsb"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - CD Burning"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Kumpulan tool untuk membaca dan mengirimkan email dan news (pine, mutt, "
+"tin..) dan untuk membrowse Web"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
 msgstr "Archive, emulator, monitoring"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Server, Database"
+msgid "Personal Finance"
+msgstr "Keuangan Pribadi"
 
 #: ../../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 ""
-"Program office: pengolah kata (kword, abiword), spreadsheet (kspread, "
-"gnumeric), viewer pdf,dsb"
+"Environment grafis dengan kumpulan aplikasi dan tool desktop yang mudah "
+"digunakan"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Server, Web/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr "Klien untuk berbagai protokol, termasuk ssh"
 
 #: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Server"
+msgid "Internet gateway"
+msgstr "Gerbang Internet"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Keuangan Pribadi"
+msgid "Sound and video playing/editing programs"
+msgstr "Program untuk memainkan/mengedit suara dan video"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "konfigurasi"
+msgid "Other Graphical Desktops"
+msgstr "Desktop Grafis lainnya"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Workstation KDE"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editor, shell, tool untuk file, terminal"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Desktop Grafis lainnya"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Program untuk mengelola keuangan, misalnya gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache dan Pro-ftpd"
+msgid "Games"
+msgstr "Game"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Server, Mail/Groupware/News"
+msgid "Personal Information Management"
+msgstr "Pengelolaan Informasi Pribadi"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Workstation Gnome"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - CD Burning"
 
 #: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+msgstr "Aplikasi Ilmu pengetahuan"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "aduh, saya ngga bisa baca file /etc/sysconfig/autologin: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Anda ingin restart konfigurasi ini?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Setuju?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Saya akan merestart device jaringan ini:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Sekarang saya mau restart device jaringan %s. Setuju ?"
+
 #, fuzzy
-msgid "Internet gateway"
-msgstr "Akses 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 ""
+#~ "Biasanya orang pilih \"/dev/hda\", kecuali kalau Anda pilih yang lain "
+#~ "(yaitu drive master IDE) atau \"/dev/sda\" (disk SCSI utama)."
 
-#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Tool untuk Palm Pilot ataupun Visor"
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Ini adalah antrian print\n"
+#~ "Anda boleh tambahkan atau mengubah yang sudah ada."
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Game"
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Waktu koneksi: "
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, dsb"
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Pilih user default:"
+
+#~ msgid "Spooler: "
+#~ msgstr "Spooler: "
+
+#~ msgid "Test the mouse here."
+#~ msgstr "Silakan tes mouse Anda"
+
+#~ msgid "Press next to continue."
+#~ msgstr "Tekan Lanjutkan utk melanjutkan"
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr "Pilihlan bahasa yang ingin Anda gunakan untuk instalasi dan sistem."
+
+#~ 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 ""
+#~ "Anda harus menerima ketentuan dalam lisensi di atas untuk melanjutkan "
+#~ "proses instalasi.\n"
+#~ "\n"
+#~ "\n"
+#~ "Silakan tekan \"Baiklah\" bila Anda setuju dengan persyaratan di atas.\n"
+#~ "\n"
+#~ "\n"
+#~ "dan silakan tekan \"Tidak Mau\" bila Anda tidak setuju. Proses instalasi "
+#~ "akan dihentikan tanpa mengubah konfigurasi yang sudah ada."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Pilih layout keyboard yg dipakai dari daftar di atas"
+
+#~ 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 ""
+#~ "Bila Anda menginginkan bahasa-bahasa lain selain bahasa yang Anda tadi "
+#~ "pilih pada saat setelah instalasi, silakan pilih pada daftar di atas. "
+#~ "Bila Anda mau semuanya, pilih saja \"Semuanya\"."
+
+#~ 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 ""
+#~ "Pilih:\n"
+#~ "\n"
+#~ "  - Customized:  Bila Anda familiar dengan Linux, Anda akan dapat\n"
+#~ " memilih penggunaan sistem ini, yaitu normal, development, atau server.\n"
+#~ " Pilih \"Normal\" untuk instalasi secara umum yang biasanya. Atau pilih\n"
+#~ " \"Development\" untuk membuat software dengan Linux Anda, atau pilih\n"
+#~ " \"Server\" bila hendak menginstall server serbaguna (mail, print, dsb)\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Pakar    :  Bila Anda sangat dekat dengan GNU/Linux dan ingin\n"
+#~ " menginstall Linux sesuka hati, ini adalah kelas instalasi yang pas\n"
+#~ " untuk Anda, dan Anda bisa memilih penggunaan sistem ini sebagaimana\n"
+#~ " pada kelas \"Customized\". JANGAN COBA-COBA PAKAI MODUS INI KALAO\n"
+#~ " belom cukup makan asam garam di dunia PERLINUXAN"
+
+#~ 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 ""
+#~ "Berikut adalah pilihan penggunaan mesin Anda :\n"
+#~ "\n"
+#~ "*Workstation: pilih ini kalau Anda hendak menggunakan mesin Anda untuk "
+#~ "mengerjakan\n"
+#~ " pekerjaan sehari-hari di kantor atau di rumah\n"
+#~ "\n"
+#~ "\n"
+#~ "* Development: pilih ini bila Anda hendak menggunakan mesin ini untuk "
+#~ "pembuatan software.\n"
+#~ " Anda akan saya kasih kumpulan software yang berguna untuk melakukan "
+#~ "kompilasi,\n"
+#~ " debug, dan format source code, atau untuk membuat paket software\n"
+#~ "\n"
+#~ "\n"
+#~ "* Server : Pilih ini bila Anda hendak menggunakan mesin ini sebagai\n"
+#~ " server. Entah itu file server (NFS ataw SMB), print server\n"
+#~ " (pakai protokol Unix lp (Line Printer) atau model windows SMB)\n"
+#~ " authentication server (NIS), database server dsb dsb.\n"
+#~ " Karena itu jangan mengharapken saya menyediakan rupa-rupa\n"
+#~ " software yang ngejreng (KDE,GNOME...) di sini."
+
+#~ 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 ""
+#~ "Sekarang Anda pilih dulu grup paket yang mau Anda install\n"
+#~ "atau yang mau diupgrade.\n"
+#~ "\n"
+#~ "DrakX sekarang akan cek apakah Anda masih punya sisa space kosong untuk\n"
+#~ "menginstall ini semua, kalau tidak nanti Anda akan diberitahu kok.\n"
+#~ "Tapi kalau Anda mau cuek aja mau install walaupun spacenya tidak cukup\n"
+#~ "gua akan menginstall semua paketnya, tapi ada beberapa paket yang aku "
+#~ "rasa\n"
+#~ "kurang penting akan tidak diinstall. Pada daftar di bawah ini Anda bisa\n"
+#~ "pilih \"Pilih paket sendiri\"; kalau-kalau Anda pingin melihat \n"
+#~ "paket-paket yang ada (ada 1000an lebih lho...)"
+
+#~ 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 ""
+#~ "Anda dapat memilih tiap-tiap paket yang hendak Anda install\n"
+#~ "\n"
+#~ "\n"
+#~ "Anda dapat membuka atau menutup tree dengan mengklik pada pilihan di "
+#~ "sudut kiri pada\n"
+#~ "windows paket\n"
+#~ "\n"
+#~ "\n"
+#~ "Bila Anda hendak melihat daftar paket yang diurut secara alfabet, pilih "
+#~ "ikon \"Togel flat dan urut grup\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Bila Anda tidak hendak diberitahu tentang dependensi paket, pilih "
+#~ "\"Dependensi otomatis\"\n"
+#~ "Dengan cara ini bila Anda membuang suatu paket, maka paket-paket terkait "
+#~ "lainnya akan dibuang\n"
+#~ "juga secara otomatis tanpa pemberitahuan."
+
+#~ 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 ""
+#~ "Kalau Anda punya semua CD pada daftar di atas, tekan OK.\n"
+#~ "Kalau tidak punya sama sekali, click Baal.\n"
+#~ "Kalau cuma punya beberapa aja, pilih aja, trus klik Ok."
+
+#~ 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 ""
+#~ "Anda kini dapat mencoba mouse. Gunakan tombol dan roda utk mencek\n"
+#~ "setting. Jika hasilnya buruk, klik \"Batal\" utk memilih driver lain.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jika Anda sedang menginstal mesin Apple dg mouse 1-tombol, ada "
+#~ "kesempatan\n"
+#~ "mendefinisikan keyboard utk mengemulasi tombol ke-2 dan ke-3.\n"
+#~ "Ini menjadikan Anda dapat mengakses fungsi penuh mouse dalam\n"
+#~ "konsol Linux dan GUI Window X.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jika Anda punya mouse ADB, pilihlah USB, karena kernel Linux akan "
+#~ "melakukan\n"
+#~ "mapping hardware mouse Anda."
+
+#~ 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 ""
+#~ "Bila Anda hendak menghubungkan komputer ini ke Internet atau ke jaringan\n"
+#~ "lokal, silakan pilih konfigurasi yang benar. Nyalakan perangkat terkait "
+#~ "sebelum\n"
+#~ "memilih konfigurasi agar dapat dideteksi oleh DrakX secara otomatis.\n"
+#~ "\n"
+#~ "\n"
+#~ "BIla anda tidak memiliki koneksi ke Internet atau jaringan lokal, pilih "
+#~ "saja\n"
+#~ "\"Matikan Jaringan\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Bila Anda hendak mengkonfigurasikan jaringan nanti setelah proses "
+#~ "instalasi selesai,atau bila Anda sudah selesai mengkonfigurasikan koneksi "
+#~ "jaringan, pilih \"Selesai\"."
+
+#~ 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 ""
+#~ "Saya tidak dapat menemukan modem di komputer ini. Silakan pilih port "
+#~ "serial mana\n"
+#~ "modem Anda dicolokkan.\n"
+#~ "\n"
+#~ "\n"
+#~ "sebagai misal, port serial pertama (pada Microsoft windows dikenal dengan "
+#~ "\"COM1\")\n"
+#~ "adalah \"ttyS0\" di GNU/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 ""
+#~ "Sekarang Anda bisa memasukan pilihan dialup. Bila Anda tidak tahu\n"
+#~ "atau ragu-ragu, informasi yang benar bisa Anda tanyakan kepada\n"
+#~ "Internet Service Provider tempat Anda berlangganan. Bila Anda tidak\n"
+#~ "memasukan DNS (name server) di sini, informasi tersebut akan\n"
+#~ "saya cari sendiri pada Internet Service Provider Anda saat melakukan "
+#~ "koneksi nanti."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Bila modem yang Anda punya adalah modem eksternal, maka tolong dong "
+#~ "dinyalakan supaya DrakXbisa mendeteksinya secara otomatis."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Silakan nyalakan modemnya dan pilih mana modem yang Anda punya"
+
+#~ 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 ""
+#~ "Bila Anda tidak yakin dengan informasi di atas apakah benar atau tidak\n"
+#~ "atau bahkan bila Anda sangat tidak tahu atau ragu mau isi apa, tenang "
+#~ "saja\n"
+#~ "informasi di atas bisa Anda tanyakan kepada Internet Service Provider "
+#~ "Anda.\n"
+#~ "Bila Anda tidak mengisi DNS (name server) di sini, nanti akan saya cari "
+#~ "sendiri\n"
+#~ "dari Internet Service Provider saat melakukan koneksi ke Internet."
+
+#~ 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 ""
+#~ "Anda bisa masukkan nama host Anda sekarang. Bila Anda tidak yakin apa "
+#~ "yang harus dimasukkan,\n"
+#~ "informasi ini bisa diperoleh dari ISP."
+
+#~ 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 ""
+#~ "Silakan konfigurasikan device jaringan Anda:\n"
+#~ "\n"
+#~ "  * Alamat IP: Kalau Anda tak tahu, tanyakan sana pada network "
+#~ "administratornya.\n"
+#~ "     Jangan masukkan alamat IP kalau Anda pilih \"IP Otomatis\" di "
+#~ "bawah.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Netmask: Pilih aja \"255.255.255.0\", kecuali kalau ragu tanya juga "
+#~ "ke\n"
+#~ " network administratornya.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - IP otomatis: Bila network Anda menggunakan bootp atau protokol dhcp, "
+#~ "pilih\n"
+#~ " ini. Bila Anda pilih ini, tak usah masukkan alamat IP di \"Alamat IP\". "
+#~ "Bila\n"
+#~ " Anda ragu juga, tanya lagi ke network administrator."
+
+#~ 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 ""
+#~ "Anda sekarang bisa memasukan nama host. Bila Anda tidak tahu atau ragu\n"
+#~ "silakan kontak network administrator Anda saja."
+
+#~ 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 ""
+#~ "Sekarang Anda boleh memasukan nama host. Bila tidak tahu\n"
+#~ "atau tidak pasti, kosongkan saja deh."
+
+#~ 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 ""
+#~ "Anda bisa masukkan dialup sekarang. Bila Anda tak yakin apa yang harus "
+#~ "dimasukkan,\n"
+#~ "informasi ini bisa diperoleh dari 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 ""
+#~ "Bila Anda mau pakai proxy, sekarang saatnya untuk mengkonfigurasi. Bila "
+#~ "Anda\n"
+#~ "tak tahu pakai proxy apa tak, tanya gih ke network administratornya atau "
+#~ "ISP."
+
+#~ 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 ""
+#~ "Anda bisa install paket kriptografi bila koneksi Internet Anda telah\n"
+#~ "dikonfig dengan benar. Sekarang pilih mirror tempat Anda ingin download\n"
+#~ "paket kriptografinya dan kemudian pilih paketnya.\n"
+#~ "\n"
+#~ "Perhatikan bahwa Anda harus pilih mirror dan kriptografi sesuai "
+#~ "ketentuan\n"
+#~ "yang berlaku di daerah Anda."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "Sekarang pilih zonawaktu tempat Anda tinggal"
+
+#~ 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 ""
+#~ "Sekarang Anda bisa mengkonfigurasikan printer lokal (terhubung ke "
+#~ "komputer Anda) atau\n"
+#~ "printer remote (yang diakses via jaringan Unix, Netware, atau 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 ""
+#~ "Bila Anda ingin dapat mencetak, silakan pilih sistem cetak CUPS atau LPR\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS adalah sistem cetak baru dan powerfull di Unix (CUPS = \"Common "
+#~ "Unix\n"
+#~ "Printing System\"). Ini adalah sistem cetak standar Linux Mandrake.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR adalah sistem cetak kuno, masih dipakai pada versi lama Linux "
+#~ "Mandrake.\n"
+#~ "\n"
+#~ "\n"
+#~ "Bila Anda tak punya printer, pilih \"Tidak Ada\""
+
+#~ 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 dapat menggunakan berbagai jenis printer. Tiap-tiap tipe "
+#~ "memerlukan setup\n"
+#~ "yang berbeda\n"
+#~ "\n"
+#~ "\n"
+#~ "Bila printer tersambung secara fisik dalam komputer ini, pilih\n"
+#~ "\"Printer Lokal\". \n"
+#~ "\n"
+#~ "Bila Anda menggunakan printer Unix jarak jauh, pilih\n"
+#~ "\"Printer remote\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Bila Anda hendak menggunakan printer pada mesin Microsoft windows (atau\n"
+#~ "pada mesin Unix dengan SMB), maka pilih \"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 ""
+#~ "Silakan nyalakan printer sebelum DrakX mendeteksinya.\n"
+#~ "\n"
+#~ "Anda perlu mengisi beberapa informasi di sini.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Nama printer: spooler cetak menggunakan nama \"lp\" sebagai nama "
+#~ "printer default\n"
+#~ "Jadi Anda pelru punya sebuah printer dengan nama \"lp\". Bila Anda "
+#~ "memiliki cuma \n"
+#~ "satu buah printer saja, Anda bisa menggunakan beberapa nama. Tuliskan "
+#~ "saja nama\n"
+#~ "itu dan pisahkan dengan karakter pipe \"|\". Jadi untuk memberi nama "
+#~ "printer dengan\n"
+#~ "nama yang mudah dimengerti, Anda bisa tuliskan: \"Printer saya|lp\".\n"
+#~ "   Printer yang memiliki \"lp\" pada namanya akan menjadi printer "
+#~ "default.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Deskripsi: ini boleh diisi boleh tidak, tapi bila diisi akan lebih "
+#~ "memudahkan Anda\n"
+#~ "untuk membedakan antara printer bila Anda memiliki printer lebih dari "
+#~ "satu buah atau bila\n"
+#~ "printer ini akan diakses oleh banyak orang.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Lokasi: Anda bisa menuliskan informasi lebih detil tentang lokasi "
+#~ "printer ini.\n"
+#~ "(misalnya \"Printer yang ada di lantai 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"
+#~ "     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 ""
+#~ "Anda perlu memasukkan beberapa informasi di sini.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Nama antrian: spooler cetak menggunakan nama \"lp\" sebagai nama "
+#~ "printer default\n"
+#~ "Jadi Anda pelru punya sebuah printer dengan nama \"lp\". Bila Anda "
+#~ "memiliki cuma \n"
+#~ "satu buah printer saja, Anda bisa menggunakan beberapa nama. Tuliskan "
+#~ "saja nama\n"
+#~ "itu dan pisahkan dengan karakter pipe \"|\". Jadi untuk memberi nama "
+#~ "printer dengan\n"
+#~ "nama yang mudah dimengerti, Anda bisa tuliskan: \"Printer saya|lp\".\n"
+#~ "   Printer yang memiliki \"lp\" pada namanya akan menjadi printer "
+#~ "default.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Direktori Spool: Dalam direktori ini semua job printer akan "
+#~ "disimpan. BIla Anda tidak\n"
+#~ "mengerti biarkan saja terisi dalam nilai defaultnya.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Koneksi Printer: Bila printer tersambung secara fisik dalam komputer "
+#~ "ini, pilih\n"
+#~ "\"Printer Lokal\". Namun bila Anda menggunakan printer Unix jarak jauh, "
+#~ "pilih\n"
+#~ "\"Printer lpd remote\".\n"
+#~ "\n"
+#~ "\n"
+#~ "   Bila Anda hendak menggunakan printer pada mesin Microsoft windows "
+#~ "(atau\n"
+#~ "pada mesin Unix dengan SMB), maka pilih \"SMB/WIndows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "   Bila Anda hendak mengakses printer pada jaringan Netware, pilih "
+#~ "\"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 ""
+#~ "Printer Anda tidak dapat dideteksi. Silakan tuliskan nama device atau di "
+#~ "mana printer Anda\n"
+#~ "tersambung.\n"
+#~ "\n"
+#~ "\n"
+#~ "Sebagai contoh, printer yang disambung ke port parallel pertma komputer "
+#~ "disebut\n"
+#~ "\"/dev/lp0\" pada GNU/Linux, dan disebut \"LPT1\" pada Microsoft windows."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Anda harus pilih printer yang Anda punya pada daftar di atas."
+
+#~ 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 ""
+#~ "Silakan pilih konfigurasi yang tepat bergantung tipe printer yang Anda "
+#~ "punya.\n"
+#~ "Silakan baca dokumentasinya bila Anda tidak tahu harus pilih apa di "
+#~ "sini.\n"
+#~ "\n"
+#~ "\n"
+#~ "Anda akan dapat melakukan test pada konfigurasi ini nanti dan bisa juga\n"
+#~ "mengubah konfigurasi ini bila tidak berjalan sebagaimana mestinya."
+
+#~ 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 ""
+#~ "Sekarang Anda mesti berikan password root untuk\n"
+#~ "sistem Linux-Mandrake ini. Password harus diketikkan dua kali untuk\n"
+#~ "verifikasi bahwa Anda tidak salah ketik.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root adalah sistem administrator. Hanya orang yang punya akses ke\n"
+#~ "account administrator saja yang dapat mengatur dan mengelola sistem.\n"
+#~ "Awas, account administrator yang disalahgunakan atau dipakai\n"
+#~ "tanpa izin akan sangat membahayakan integritas sistem, data,\n"
+#~ "dan sistem lain yang terhubung. \n"
+#~ "\n"
+#~ "\n"
+#~ "Password haruslah campuran dari\n"
+#~ "karakter alfanumerik dan panjangnya minimal 8 karakter. Jangan\n"
+#~ "pernah menuliskan password Anda di kertas atau di mana saja. \n"
+#~ "\n"
+#~ "Jangan buat password Anda terlalu panjang atau rumit, nanti bisa lupa."
+
+#~ 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 ""
+#~ "Jika jaringan Anda memakai protokol otentikasi LDAP/NIS, pilih\n"
+#~ "\"LDAP\" (atau \"NIS\") . Jika Anda tak tahu, tanyalah admin jaringan "
+#~ "Anda.\n"
+#~ "\n"
+#~ "Jika komputer tak terhubung jaringan, Anda dapat memilih\n"
+#~ "\"File lokal\" utk otentikasi."
+
+#~ 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 ""
+#~ "Silakan Anda buat satu atau lebih user \"biasa\", setelah Anda\n"
+#~ "membuat user \"pihak berwenang\", yaitu root. Anda bisa buat\n"
+#~ "user untuk tiap orang yang Anda perbolehkan untuk mengakses komputer\n"
+#~ "ini. Perhatikan bahwa tiap account user akan memiliki preferesi\n"
+#~ "sendiri-sendiri (environment grafis, seting program dsb)\n"
+#~ "dan juga punya \"direktori home\" sendiri, tempat preferensi tadi\n"
+#~ "disimpan\n"
+#~ "\n"
+#~ "\n"
+#~ "Pertama-tama, buatlah account untuk Anda sendiri! Buatlah walau Anda\n"
+#~ "adalah satu-satunya orang yang mengakses mesin ini. Anda nanti tidak\n"
+#~ "BOLEH mengakses mesin ini untuk keperluan sehari-hari, karena merupakan\n"
+#~ "resiko besar bila Anda sering login sebagai root. Biasanya ini "
+#~ "disebabkan\n"
+#~ "karena salah ketik, dsb.\n"
+#~ "\n"
+#~ "\n"
+#~ "Karena itu, biasakan untuk konek ke msein ini dengan menggunakan account\n"
+#~ "yang telah Anda buat disini, dan login sebagai root, hanya untuk \n"
+#~ "keperluan administratif dan maintenance saja yah."
+
+#~ 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 ""
+#~ "Sangat disarankan Anda membuat bootdisk. Bila Anda gagal\n"
+#~ "memboot komputer, bootdisk adalah satu-satunya cara untuk\n"
+#~ "menyelamatkan sistem tanpa instal ulang."
+
+#~ 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 ""
+#~ "Pilihan LILO dan grub adalah:\n"
+#~ "  - Boot device: Set nama devicenya (misalnya hard disk partisi) yang "
+#~ "berisi boot sector\n"
+#~ "                 pilih \"/dev/hda\", kecuali kalau Anda tahu yang "
+#~ "pastinya.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay sebelum boot ke image default: Menentukan waktu dalam "
+#~ "sepersepuluh detik\n"
+#~ " sebelum boot loader akan meload image yang default (pertama). Ini "
+#~ "berguna\n"
+#~ " pada sistem yang boot dari hard disk dan keyboardnya dinyalakan. Boot "
+#~ "loader\n"
+#~ " tidak menunggu bila \"delay\" dihilangkan atau diset ke nol.\n"
+#~ "\n"
+#~ "\n"
+#~ " - Video mode: Menentukan mode text VGA yang dipilih saat booting. \n"
+#~ " Setting yang bisa dipakai: \n"
+#~ "  * normal: pilih mode text 80x25\n"
+#~ "  * <angka>: gunakan mode text.\n"
+#~ "\n"
+#~ "\n"
+#~ "   - Hapus \"/tmp\" saat boot bila Anda ingin menghapus semua file-file "
+#~ "di dalam direktori\n"
+#~ "\"/tmp\" saat boot sistem dimulai.\n"
+#~ "\n"
+#~ "\n"
+#~ "   - Ukuran RAM yang tepat. Duh, ngga ada metode standar untuk "
+#~ "mendapatkan \n"
+#~ "angka jumlah RAM yang tepat di komputer tertentu. Jadi, Linux mungkin "
+#~ "akan\n"
+#~ "salah mendeteksi jumlah RAM yang Anda punya sekarang. Bila benar, saya "
+#~ "salah\n"
+#~ "tebak angka RAMnya di sini, silakan masukkan angka yang benar. Oh ya,\n"
+#~ "beda 2 atau 4 MB sih ngga masalah loh."
+
+#~ 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 adalah bootloader untuk SPARC: Dianya akan memboot\n"
+#~ "GNU/Linux atau sistem operasi lain yang ada di komputer ini.\n"
+#~ "Biasanya, sistem operasi yang sudah ada akan secara normal di deteksi "
+#~ "dan\n"
+#~ "diinstallkan. Bila ternyata nanti tak bisa, Anda bisa tambahkan sendiri\n"
+#~ "secara manual di sini. Hati-hati yah nanti waktu kasih parameternya.\n"
+#~ "\n"
+#~ "\n"
+#~ "Anda juga bisa menutup akses ke sistem operasi tertentu. Caranya gampang "
+#~ "aja\n"
+#~ "Anda bisa hapus entrinya disini. Tapi untuk bisa masuk ke sistem operasi "
+#~ "itu\n"
+#~ "Anda perlu bootdisk nantinya."
+
+#~ 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 ""
+#~ "Pilihan SILO dan grub adalah:\n"
+#~ "  - Instalasi Bootloader: Tempat Anda hendak meletakkan informasi boot\n"
+#~ " ke GNU/Linux. Pilih aja \"Sektor pertama di drive (MBR)\", kecuali\n"
+#~ " elu udah tau tempatnya\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Delay sebelum boot ke image default: Menentukan waktu dalam "
+#~ "sepersepuluh detik\n"
+#~ " sebelum boot loader akan meload image yang default (pertama). Ini "
+#~ "berguna\n"
+#~ " pada sistem yang boot dari hard disk dan keyboardnya dinyalakan. Boot "
+#~ "loader\n"
+#~ " tidak menunggu bila \"delay\" dihilangkan atau diset ke nol."
+
+#~ 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 ""
+#~ "Sekarang Anda akan mengkonfigurasikan X Window System, yang merupakan\n"
+#~ "inti GUI (Graphical User Interface) bagi GNU/Linux. Sekarang,\n"
+#~ "Anda harus konfigurasikan video card dan monitor. Biasanya\n"
+#~ "tahapan ini akan otomatis, tapi Anda perlu verifikasi\n"
+#~ "hasil deteksi dan memeriksanya, benar apa tidak:)\n"
+#~ "\n"
+#~ "\n"
+#~ "Setelah itu, X akan dijalankan (kecuali kalau Anda bilang jangan)\n"
+#~ "dan periksa apakah settingnya sudah cocok atau belum.\n"
+#~ "Kalau tidak cocok, Anda bisa kembali lagi dan mengubah konfigurasi\n"
+#~ "lalu coba lagi."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Bila ada yang ngaco pada konfigurasi Xnya, silaken pakai pilihan ini "
+#~ "untuk\n"
+#~ "membuat X Window System lebih bagus."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Bila Anda ingin menggunakan login grafik, pilih \"Ya\". Sebaliknya,\n"
+#~ "pilih \"Tidak\"."
+
+#~ 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 ""
+#~ "Silakan pilih tingkat keamanan sistem ini. Baca dulu manualnya untuk info "
+#~ "lebihlengkap\n"
+#~ "Kalau Anda tak tahu, pilih saja default.\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 ""
+#~ "Sistem Anda akan diboot ulang.\n"
+#~ "\n"
+#~ "Setelah itu, Linux Mandrake akan di-load otomatis.\n"
+#~ "Bila Anda ingin boot ke sistem operasi lain, silakan baca instruksi\n"
+#~ "tambahan."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "Ceko (Programmer)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slovakia (Programmer)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Beri nama profil yang hendak dibuat:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Tulis /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Baca dari file"
+
+#~ msgid "Save in file"
+#~ msgstr "Simpan di file"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Pulihkan dari floppy"
+
+#~ msgid "Format all"
+#~ msgstr "Format semua"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Setelah melakukan format semua partisi,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "seluruh data dalam partisi-partisi ini akan hilang"
+
+#~ msgid "Reload"
+#~ msgstr "Reload"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr "Mau buat disket auto install untuk replikasi linux?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "konfigurasi 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 ""
+#~ "Dengan server CUPS remote, Anda tidak perlu mengkonfigurasikan\n"
+#~ "printer di sini; printer nantinya akan secara otomatis dideteksi\n"
+#~ "kecuali servernya ada di jaringan lain; dalam hal ini, Anda perlu\n"
+#~ "memasukan alamat IP server CUPS itu dan nomor portnya kalau ada."
+
+#~ msgid "Enter Printer Name and Comments"
+#~ msgstr "Isi Nama Printer dan Komentar"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Tools untuk memudahkan konfigurasi komputer."
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Nama antrian remote hilang!"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Kumpulan tool untuk mail, news, web, transfer file, dan chat"
+#~ msgid "Pipe into command"
+#~ msgstr "Pipe ke perintah"
+
+#~ msgid ""
+#~ "Here you can specify any arbitrary command line into which the job should "
+#~ "be piped instead of being sent directly to a printer."
+#~ msgstr ""
+#~ "Di sini Anda dapat menentukan perintah sebarang di mana job harus "
+#~ "disodorkan, bukannya dikirim langsung ke printer."
+
+#~ msgid "Command line"
+#~ msgstr "Perintah"
+
+#~ msgid "A command line must be entered!"
+#~ msgstr "Harus diisi perintah"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Monitoring Jaringan"
+
+#~ msgid "Settings"
+#~ msgstr "Setting"
+
+#~ msgid "Profile "
+#~ msgstr "Profil "
+
+#~ msgid "Statistics"
+#~ msgstr "Statistik"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "Kecepatan Kirim"
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "Kecepatan Terima: "
+
+#~ msgid "Connection Time: "
+#~ msgstr "Waktu koneksi: "
+
+#~ msgid "Logs"
+#~ msgstr "Log"
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Sambung koneksi Internet"
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Putuskan koneksi Internet"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "koneksi Internet gagal diputus"
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "koneksi Internet selesai diputus"
+
+#~ msgid "Connection complete."
+#~ msgstr "Koneksi selesai"
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "Koneksi gagal\n"
+#~ "Silakan periksa konfigurasinya di Mandrake Control Center"
+
+#~ msgid "Color configuration"
+#~ msgstr "Konfigurasi warna"
+
+#~ msgid "sent: "
+#~ msgstr "terkirim: "
+
+#~ msgid "received: "
+#~ msgstr "diterima: "
+
+#~ msgid "average"
+#~ msgstr "rata-rata"
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid "Connect"
+#~ msgstr "Tersambung"
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ msgid "Disconnect"
+#~ msgstr "Putus"
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ msgid "/File/_New"
+#~ msgstr "/File/_Baru"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d menit"
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
 
-#~ msgid "1 minute"
-#~ msgstr "1 menit"
+#~ msgid "/File/_Open"
+#~ msgstr "/File/_Buka"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d detik"
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/File/_Simpan"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/File/Simpan _Dengan nama lain"
+
+#~ msgid "/File/-"
+#~ msgstr "/File/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Pilihan"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Pilihan/Test"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Help"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Help/_About..."
+
+#~ msgid "Default Runlevel"
+#~ msgstr "Runlevel standar"
+
+#~ msgid "Europe"
+#~ msgstr "Eropa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Hapus Antrian"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Isi file konfigurasi tidak dapat dibaca"
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Config file tidak dikenal"
+
+#~ msgid "Adapter"
+#~ msgstr "Adapter"
+
+#~ msgid "Disable network"
+#~ msgstr "Matikan jaringan"
+
+#~ msgid "Enable network"
+#~ msgstr "Aktifkan jaringan"
+
+#~ 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 ""
+#~ "Sekarang Anda bisa test mousenya. Tekan tombol mousenya dan gerakan "
+#~ "mousenya juga\n"
+#~ "untuk mencoba apakah sudah bisa atau belum. Bila belum, silakan pilih "
+#~ "\"Batal\" untuk kembali\n"
+#~ "memilih driver yang lain."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "Konfigurasi koneksi DSL (atau ADSL)"
+
+#~ msgid "Choose"
+#~ msgstr "Pilih"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "Anda bisa memasukan URI untuk mengakses printer dengan CUPS."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Ya, Test cetak ascii"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Ya, Test cetak postscript"
+
+#~ msgid "Paper Size"
+#~ msgstr "Ukuran Kertas"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Kertas di eject habis ngeprint?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Parameter driver Uniprint"
+
+#~ msgid "Color depth options"
+#~ msgstr "Pilihan kedalaman warna"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Cetak text dalam PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Betulkan efek tangga pada teks ?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Jumlah halaman per output"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Margin Kiri/Kanan dalam point (1/72 inci)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Margin Atas/Bawah dalam point (1/72 inci)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Extra option pada GhostScript"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Pilihan text extra"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Balikkan urutan halaman"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS dijalankan"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Pilih koneksi Printer remote"
+
+#~ 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 ""
+#~ "Tiap antrian cetak harus punya nama (biasanya lp).\n"
+#~ "Parameter lain seperti keterangan dan lokasi printer bisa ditambahkan.\n"
+#~ "Sekarang saya mau tanya,\n"
+#~ "nama printer yang digunakan ini apa yah ?\n"
+#~ "Juga saya mau tanya bagaimana printernya disambungkan ke situ?"
+
+#~ 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 ""
+#~ "Tiap antrian cetak harus punya nama (biasanya lp) dan direktori spool\n"
+#~ "yang dialokasikan untuknya. Sekarang saya mau tanya,\n"
+#~ "nama antrian dan direktori yang digunakan apa yah ?\n"
+#~ "Juga saya mau tanya bagaimana printernya disambungkan ke situ?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Nama Antrian"
+
+#~ msgid "Spool directory"
+#~ msgstr "Direktori spool"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Agar sistem Anda lebih secure, silakan pilih \"Gunakan file shadow\" "
+#~ "dan \n"
+#~ "\"Password Pakai MD5\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Bila network Anda menggunakan NIS, pilih \"Gunakan NIS\". Kalau tak tahu, "
+#~ "tanya\n"
+#~ "network admin Anda dong."
+
+#~ msgid "yellow pages"
+#~ msgstr "yellow pages"
+
+#~ msgid "Light configuration"
+#~ msgstr "Konfigurasi ringan"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "DNS Provider 1"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "DNS Provider 2"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Pilih cara yang Anda inginkan untuk terhubung ke Internet"
 
 #~ msgid "cannot fork: "
 #~ msgstr "tidak bisa fork: "
@@ -8347,9 +10145,8 @@ msgstr "Kumpulan tool untuk mail, news, web, transfer file, dan chat"
 #~ msgid "Configure..."
 #~ msgstr "Konfigurasikan ..."
 
-#, fuzzy
 #~ msgid "Lilo/Grub configuration"
-#~ msgstr "konfigurasi LAN"
+#~ msgstr "Konfigurasi LILO/GRUB"
 
 #~ msgid "Selected size %d%s"
 #~ msgstr "Ukuran yang dipilih %d%s"
@@ -8357,11 +10154,5 @@ msgstr "Kumpulan tool untuk mail, news, web, transfer file, dan chat"
 #~ msgid "Opening your connection..."
 #~ msgstr "Buka koneksi ini..."
 
-#~ msgid "Standard tools"
-#~ msgstr "Tool Standard"
-
 #~ msgid "This startup script try to load your modules for your usb mouse."
 #~ msgstr "Skrip ini akan meload modul untuk mouse usb"
-
-#~ msgid "Configuration de Lilo/Grub"
-#~ msgstr "konfigurasi Lilo/Grub"
diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po
index d7f0f78fb..563690826 100644
--- a/perl-install/share/po/it.po
+++ b/perl-install/share/po/it.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 0.1\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-09-12 05:33+0200\n"
 "Last-Translator:  Roberto Rosselli Del Turco <rosselli@ling.unipi.it>\n"
 "Language-Team: \n"
@@ -16,24 +16,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 tutte le testine indipendentemente"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Usa l'estensione Xinerama"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Configura solo la scheda \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Configurazione multi-testine"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -41,33 +41,33 @@ msgstr ""
 "Il tuo sistema supporta la configurazione di pi� testine.\n"
 "Cosa vuoi fare?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Scheda grafica"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Scegli una scheda grafica"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Scegli un server X"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "Server 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 "Che configurazione di XFree vuoi avere?"
 
-#: ../../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"
@@ -77,19 +77,20 @@ msgstr ""
 "La tua scheda � supportata da XFree %s che potrebbe avere un miglior "
 "supporto in 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 ""
 "La tua scheda pu� avere il supporto per l'accelerazione 3D hardware con "
 "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 con accelerazione 3D hardware"
 
-#: ../../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"
@@ -98,12 +99,12 @@ msgstr ""
 "La tua scheda pu� avere l'accelerazione 3D hardware con XFree %s,\n"
 "NOTA CHE � UN SUPPORTO SPERIMENTALE E POTREBBE BLOCCARE IL TUO COMPUTER."
 
-#: ../../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 con accelerazione 3D hardware SPERIMENTALE"
 
-#: ../../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 +116,31 @@ msgstr ""
 "La tua scheda � supportata da XFree %s che potrebbe avere un miglior "
 "supporto in 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr "Xpmac (installazione driver video)"
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "Configurazione di XFree"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Scegli la quantit� di memoria della tua scheda grafica"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Scegli le opzioni per il server"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Scegli 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"
@@ -159,39 +164,39 @@ msgstr ""
 "danneggiarlo.\n"
 "Se hai dubbi, scegli un settaggio prudente."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Frequenza di refresh orizzontale"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Frequenza di refresh verticale"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Monitor non configurato"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Scheda grafica non ancora configurata"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Risoluzioni non ancora selezionate"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Vuoi provare la configurazione ?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Attenzione: il test di questa scheda video pu� bloccare il computer"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Test della configurazione"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -199,152 +204,156 @@ msgstr ""
 "\n"
 "prova a modificare alcuni parametri"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Si � verificato un errore:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Uscita in %d secondi"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "� il settaggio corretto?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Si � verificato un errore, prova a modificare alcuni parametri"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Risoluzione"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Seleziona risoluzione e profondit� di colore"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Scheda grafica: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Server 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 "Modo Esperto"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Mostra tutto"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Risoluzioni"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tipo di tastiera: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo di mouse: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Dispositivo del mouse: %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 "Frequenza orizzontale del monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Refresh verticale del monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Scheda grafica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Scheda grafica: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Memoria scheda grafica: %s KB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profondit� di colore: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Risoluzione: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Server XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "Driver XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Sto preparando la configurazione di X-Window"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Cosa vuoi fare?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Cambia monitor"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Cambia scheda grafica"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Cambia opzioni server"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Cambia risoluzione"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Mostra informazioni"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Nuovo test"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Esci"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -357,20 +366,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Per favore rientra come %s per attivare le modifiche"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Per favore esci e usa Ctrl-Alt-Backspace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X all'avvio"
 
-#: ../../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?"
@@ -423,216 +432,224 @@ msgid "8 MB"
 msgstr "8 Mb"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 Mb o superiore"
+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 o pi�"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA standard, 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 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "Compatibile 8514, 1024x768 a 87 Hz interlacciato (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 interlacciato, 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 estesa, 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 non-interlacciato, 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 alta frequenza, 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-frequenza che raggiunge 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-frequenza che raggiunge 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-frequenza che raggiunge 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 che raggiunge 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 che raggiunge 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 "Primo settore della partizione di boot"
 
-#: ../../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 "Primo settore del disco rigido (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "Installazione di 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 "Dove vuoi installare il bootloader?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "Installazione di 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 con menu in modo testo"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO con menu grafico"
 
-#: ../../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 "Avvia da DOS/Windows (usando 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 "Opzioni principali del bootloader"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Bootloader da usare"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Installazione del bootloader"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Dispositivo di boot"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (non funziona con vecchi BIOS)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Compatta"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "compatta"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Modo video"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Ritardo prima di avviare con l'immagine predefinita"
 
-#: ../../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 "Password"
 
-#: ../../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 "Password (ripeti)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Limita opzioni della linea di comando"
 
-#: ../../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 "Pulisci /tmp ad ogni avvio"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Precisa la dimensione RAM se necessario (trovati %d Mb)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Abilita profili multipli"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Specifica dimensione RAM in Mb"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "L'opzione ''Limita opzioni della linea di comando'' � inutile\n"
 "senza una password"
 
-#: ../../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 "Per favore prova di nuovo"
 
-#: ../../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 "Le password non corrispondono"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Messaggio di init"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Attesa dell'Open Firmware"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Attesa per il boot del kernel"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Abilita l'avvio da CD-ROM?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Abilita boot OF?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Sistema operativo predefinito?"
 
-#: ../../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."
@@ -640,145 +657,144 @@ msgstr ""
 "Queste sono le voci attuali.\n"
 "Puoi aggiungerne altre o cambiare quelle esistenti."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../../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 "Fatto"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Che tipo di voce vuoi aggiungere"
 
-#: ../../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 "Altro OS (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Altro OS (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Altro OS (windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Immagine"
 
-#: ../../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 "Aggiungi"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Lettura-scrittura"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tabella"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Non sicuro"
 
-#: ../../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 "Etichetta"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Dimensioni Initrd"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "No Video"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Rimuovi voce"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Etichetta vuota non ammessa"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Questa etichetta � gi� stata usata"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Che tipo di partizionamento?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Trovate %s interfacce %s"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Ne hai un'altra?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Hai una qualsiasi interfaccia %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 "Vedi informazioni hardware"
 
 #. -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 "Installazione driver per scheda %s %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 "Quale driver %s dovrei provare?"
 
-#: ../../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"
@@ -796,20 +812,20 @@ msgstr ""
 "informazioni di cui ha bisogno? Occasionalmente, la ricerca bloccher� il\n"
 "computer, ma non dovrebbe causare alcun danno."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Investgazione automatica"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Specifica opzioni"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Adesso puoi passare le sue opzioni al modulo %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -820,11 +836,11 @@ msgstr ""
 "Le opzioni sono in formato ''nome=valore nome2=valore2 ...''.\n"
 "Per esempio, ''io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Opzioni del modulo:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -833,34 +849,34 @@ msgstr ""
 "Caricamento del modulo %s fallito.\n"
 "Vuoi riprovare con altri parametri?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s gi� aggiunto)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Questa password � troppo semplice"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Per favore fornisci un nome utente"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Il nome utente deve contenere solo lettere minuscole, numeri, '-' e '_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Questo nome utente � gi� stato aggiunto"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Aggiungi utente"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -869,55 +885,65 @@ msgstr ""
 "Inserisci un utente\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Accetta utente"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Vero nome"
 
-#: ../../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 "Nome utente"
 
-#: ../../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 "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 ""
-"Posso configurare il tuo computer per effettuare automaticamente il login di "
-"un utente.\n"
-"Se non vuoi usare questa funzione, clicca sul tasto cancel."
+"Posso configurare il tuo computer per eseguire X automaticamente all'avvio.\n"
+"Vuoi che X venga eseguito quando riavvierai?"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
+#, fuzzy
 msgid "Choose the default user:"
-msgstr "Scegli l'utente predefinito:"
+msgstr "Scegli la nuova dimensione"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
+#, fuzzy
 msgid "Choose the window manager to run:"
-msgstr "Scegli il window manager da lanciare:"
+msgstr "Scegli l'utilit� che vuoi usare"
+
+#: ../../any.pm_.c:771
+#, fuzzy
+msgid "Please, choose a language to use."
+msgstr "Per favore, scegli il tipo del tuo mouse."
+
+#: ../../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"
@@ -926,104 +952,66 @@ msgid ""
 "wait %d seconds for default boot.\n"
 "\n"
 msgstr ""
-"Benvenuto in %s, il selezionatore di sistema operativo!\n"
-"\n"
-"Scegli un sistema operativo dalla lista qui sopra o\n"
-"aspetta %d secondi per l'avvio predefinito.\n"
-"\n"
 
-# 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
-# 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
-#
-# The lines must fit on screen, aka length < 80
-# 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 "Benvenuto in GRUB, il selettore di sistema operativo!"
+msgstr ""
 
-# 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
-# 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
-#
-# The lines must fit on screen, aka length < 80
-# 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:812
+#: ../../bootloader.pm_.c:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Usa i tasti %c e %c per selezionare quale voce e` evidenziata."
+msgstr ""
 
-# 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
-# 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
-#
-# The lines must fit on screen, aka length < 80
-# 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:815
+#: ../../bootloader.pm_.c:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Premi Invio per caricare l'OS scelto, 'e' per modificare i"
+msgstr ""
 
-# 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
-# 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
-#
-# The lines must fit on screen, aka length < 80
-# 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:818
+#: ../../bootloader.pm_.c:844
 msgid "commands before booting, or 'c' for a command-line."
-msgstr "comandi prima di avviare il sistema, o 'c' per una riga di comando."
+msgstr ""
 
-# 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
-# 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
-#
-# The lines must fit on screen, aka length < 80
-# 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:821
+#: ../../bootloader.pm_.c:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "La voce evidenziata sar� avviata automaticamente fra %d secondi."
+msgstr ""
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
-msgstr "non c'� abbastanza spazio in /boot"
+msgstr ""
 
 #. -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 "Scrivania"
+msgstr ""
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:920
+#: ../../bootloader.pm_.c:953
+#, fuzzy
 msgid "Start Menu"
-msgstr "Menu di partenza"
+msgstr "Status:"
+
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Dove vuoi installare il bootloader?"
 
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
-msgstr "nessun aiuto disponibile al momento.\n"
+msgstr ""
 
 #: ../../bootlook.pm_.c:62
+#, fuzzy
 msgid "Boot Style Configuration"
 msgstr "Configurazione metodo di avvio"
 
@@ -1031,68 +1019,43 @@ msgstr "Configurazione metodo di avvio"
 msgid "/_File"
 msgstr "/_File"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/File/_Nuovo"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/File/_Apri"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/File/_Salva"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/File/Save _come"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/File/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
+#, fuzzy
 msgid "/File/_Quit"
-msgstr "/File/_Esci"
+msgstr "/File/-"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Opzioni"
+#: ../../bootlook.pm_.c:91
+msgid "NewStyle Categorizing Monitor"
+msgstr ""
+
+#: ../../bootlook.pm_.c:92
+#, fuzzy
+msgid "NewStyle Monitor"
+msgstr "Monitoraggio della rete"
 
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Opzioni/Test"
+#: ../../bootlook.pm_.c:93
+#, fuzzy
+msgid "Traditional Monitor"
+msgstr "Cambia monitor"
 
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Aiuto"
+#: ../../bootlook.pm_.c:94
+msgid "Traditional Gtk+ Monitor"
+msgstr ""
 
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Aiuto/_Riguardo..."
+#: ../../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
-msgid "Configure"
-msgstr "Configura"
+#: ../../bootlook.pm_.c:100
+#, fuzzy
+msgid "Lilo/grub mode"
+msgstr "Modalit� di chiamata"
 
-#: ../../bootlook.pm_.c:114
+#: ../../bootlook.pm_.c:102
 #, fuzzy, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
@@ -1104,452 +1067,663 @@ msgstr ""
 "\n"
 "Cliccate su ``Configura'' se volete lanciare il Wizard di configurazione."
 
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Modalit� Lilo/Grub"
-
-#: ../../bootlook.pm_.c:131
-msgid "NewStyle Categorizing Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:134
-msgid "NewStyle Monitor"
-msgstr "Monitor NewStyle"
-
-#: ../../bootlook.pm_.c:137
-msgid "Traditional Monitor"
-msgstr "Monitor tradizionale"
-
-#: ../../bootlook.pm_.c:140
-msgid "Traditional Gtk+ Monitor"
-msgstr "Monitor tradizionale Gtk+"
-
-#: ../../bootlook.pm_.c:144
-msgid "Launch Aurora at boot time"
-msgstr "Lancia Aurora al momento del boot"
+#: ../../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
+#, fuzzy
 msgid "Boot mode"
-msgstr "Modalit� di boot"
+msgstr "Dispositivo di boot"
+
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr ""
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:138
+#, fuzzy
 msgid "Launch the X-Window system at start"
-msgstr "Lancia il sistema X-Window all'avvio"
+msgstr "Lancia il sistema audio sulla tua macchina"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
-msgstr "No, non voglio effettuare l'autologin"
+msgstr ""
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "S�, voglio l'autologin per questo (utente, desktop)"
+msgstr ""
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Modalit� di sistema"
+#: ../../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:228
+#: ../../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
 #, fuzzy
-msgid "Default Runlevel"
-msgstr "Predefinito"
-
-#: ../../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
-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
 msgid "Cancel"
-msgstr "Annulla"
-
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "non ho potuto aprire /etc/inittab per leggere: $!"
+msgstr "Francia"
 
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "non ho potuto aprire /etc/sysconfig/autologin per leggere: $!"
+#: ../../bootlook.pm_.c:224
+#, fuzzy, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "Non riesco ad aprire %s in scrittura: %s\n"
 
-#: ../../bootlook.pm_.c:435 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
+#, fuzzy
 msgid "Installation of LILO failed. The following error occured:"
-msgstr "Installazione di LILO fallita. C'� stato il seguente errore:"
-
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Crea"
+msgstr ""
+"Installazione del bootloader fallita. Si � verificato il seguente errore:"
 
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Esegui unmount"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Cancella"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatta"
+#: ../../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 "Ridimensiona"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr ""
 
-#: ../../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 ""
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Punto di mount"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Scrivi /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d secondi"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Passa a modo Esperto"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Passa a modo Normale"
+#: ../../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 "Ripristina da file"
+#: ../../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 ""
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Salva su file"
+#: ../../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 "Errore"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
-msgstr "Wizard"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Ripristina da floppy"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Nuovo"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Salva su floppy"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Rimuovi"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Azzera tutto"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Punto di mount"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Formatta tutto"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Opzioni"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Alloca automaticamente"
+#: ../../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 "Tutte le partizioni primarie sono usate"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Esegui unmount"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Non posso aggiungere altre partizioni"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Esegui mount"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Scegli un'azione"
+
+#: ../../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 avere pi� partizioni, per favore eliminarne una per essere in grado di "
-"crearne una estesa"
+"Hai una grossa partizione\n"
+"(generalmente usata da Microsoft Dos/Windows).\n"
+"Per prima cosa suggerisco di ridimensionare quella partizione\n"
+"(clicca su di essa, poi clicca su \"Ridimensiona\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Non c'� abbastanza spazio libero per l'allocazione automatica"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Per favore clicca su una partizione"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Un passo indietro"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Per favore clicca su una partizione"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Scrivi la tabella delle partizioni"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Per favore clicca su una partizione"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Ancora"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Dettagli"
 
-#: ../../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 "mount fallito"
+
+#: ../../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 "Vuoto"
 
-#: ../../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 "Altro"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Tipo di filesystem:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Dettagli"
+#: ../../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 "Usa ''%s'' invece"
+
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Cancella"
+
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Prima usa ''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 ""
-"Hai una grossa partizione\n"
-"(generalmente usata da Microsoft Dos/Windows).\n"
-"Per prima cosa suggerisco di ridimensionare quella partizione\n"
-"(clicca su di essa, poi clicca su \"Ridimensiona\")"
+"Dopo aver cambiato tipo di partizione %s, tutti i dati su questa partizione "
+"saranno persi"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Per favore prima fai un backup dei tuoi dati"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Dove vuoi fare il mount del dispositivo %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 "Leggere attentamente!"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Opzioni del modulo:"
 
-#: ../../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 pensi di usare aboot, fai attenzione a lasciare abbastanza spazio libero "
-"(2048 settori sono sufficienti)\n"
-"all'inizio del disco"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Fai attenzione: questa operazione � pericolosa."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "Automounting di media rimovibili"
 
-#: ../../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 "Errore"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Cambia il tipo di partizione"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Punto di mount:"
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Quale filesystem vuoi?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Dispositivo: "
+#: ../../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 "Lettera di drive DOS: %s (solo una supposizione)\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 "Tipo: "
+#: ../../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 "Nome: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Server"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Inizia: settore %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Dimensione: %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 settori"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Da cilindro %d a cilindro %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Scegli un'azione"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Formattato\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Crea una nuova partizione"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Non formattato\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "In linea\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Passa a modo Esperto"
 
-#: ../../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 "Passa a modo Normale"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "File di loopback: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Un passo indietro"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Partizione di boot predefinita\n"
-"    (per boot MS-DOS, non per lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Continuo comunque?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Livello %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Esci senza salvare"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Dimensione del blocco %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Esci senza scrivere la tabella delle partizioni?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "Dischi RAID %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Vuoi provare la configurazione ?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Nome file di loopback: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Alloca automaticamente"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Azzera tutto"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Ancora"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Ricerca del disco fisso"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Non c'� abbastanza spazio libero per l'allocazione automatica"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Tutte le partizioni primarie sono usate"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Non posso aggiungere altre partizioni"
+
+#: ../../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"
-"Molto probabilmente questa partizione �\n"
-"una partizione Driver, � meglio\n"
-"non toccarla.\n"
+"Per avere pi� partizioni, per favore eliminarne una per essere in grado di "
+"crearne una estesa"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Scrivi la tabella delle partizioni"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Recupera tabella delle partizioni"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Recupera tabella delle partizioni"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Recupera tabella delle partizioni"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Automounting di media rimovibili"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Scegli file"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../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"
-"Questa speciale partizione di boot\n"
-"viene utilizzata per effettuare\n"
-"il dual-boot del tuo sistema.\n"
+"La copia di sicurezza della tabella delle partizioni non ha la stessa\n"
+"dimensione. Continuo comunque?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Per favore clicca su una partizione"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Attenzione"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Dimensione: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Inserisci un floppy nel drive\n"
+"Tutti i dati su questo floppy saranno persi"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometria: %s cilindri, %s testine, %s settori\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Provo a recuperare la tabella delle partizioni"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "Dischi LVM %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Mostra informazioni"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Tipo tabella delle partizioni: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Ridimensiona"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "su bus %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Sposta"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Esegui mount"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatta"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Attivo"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Aggiungi a RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Rimuovi da RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Modifica RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Aggiungi a LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Rimuovi da RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Rimuovi da LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Modifica RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Usa per loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Scegli un'azione"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Crea una nuova partizione"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Settore iniziale: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Dimensione in Mb: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Tipo di filesystem: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Punto di mount:"
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Preferenza: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Formattazione file di loopback %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Cambia il tipo di partizione"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr "Passo da ext2 a ext3"
+
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "Dove vuoi fare il mount del file 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 ""
+"Non puoi deselezionare punti di mount perch� questa partizione � usata\n"
+"per il loopback. Prima rimuovi il loopback"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Calcolo dei vincoli del filesystem FAT"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Ridimensionamento"
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Questa partizione non � ridimensionabile"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Dovresti eseguire il backup di tutti i dati su questa partizione"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"Dopo aver ridimensionato la partizione %s, tutti i dati su questa partizione "
+"saranno persi"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Scegli la nuova dimensione"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Dimensione in Mb: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Su quale disco vuoi spostarlo?"
+
+#: ../../diskdrake_interactive.pm_.c:632
+msgid "Sector"
+msgstr "Settore"
+
+#: ../../diskdrake_interactive.pm_.c:633
+msgid "Which sector do you want to move it to?"
+msgstr "Su che settore vuoi spostarlo?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Spostamento"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Spostamento partizione..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Scegli un RAID esistente a cui effettuare l'aggiunta"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "nuovo"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Scegli un LVM esistente a cui effettuare l'aggiunta"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "Nome LVM?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Questa partizione non pu� essere usata per il loopback"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Nome file loopback: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Vero nome"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "File gi� usato da un altro loopback, selezionane uno diverso"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Il file esiste gi�. Lo uso?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "dispositivo"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "livello"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "dimensione del blocco"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Fai attenzione: questa operazione � pericolosa."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Che tipo di partizionamento?"
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1561,7 +1735,7 @@ msgstr ""
 "Nel caso tu usassi LILO non funzionerebbe, o se non usassi LILO non ti "
 "servirebbe /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"
@@ -1573,7 +1747,7 @@ msgstr ""
 "partizione /boot. Se hai intenzione di usare LILO come boot manager, "
 "accertati di creare una partizione /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"
@@ -1583,287 +1757,247 @@ msgstr ""
 "Nessun bootloader pu� gestirla senza una partizione /boot.\n"
 "Perci� accertati di aggiungere una partizione /boot."
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Usa ''%s'' invece"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Prima usa ''Unmount''"
-
-#: ../../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"
+msgid "Partition table of drive %s is going to be written to disk!"
 msgstr ""
-"Dopo aver cambiato tipo di partizione %s, tutti i dati su questa partizione "
-"saranno persi"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Continuo comunque?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Esci senza salvare"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Esci senza scrivere la tabella delle partizioni?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Cambia il tipo di partizione"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Quale filesystem vuoi?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Non puoi usare ReiserFS per partizioni pi� piccole di 32MB"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Dove vuoi fare il mount del file loopback %s?"
-
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Dove vuoi fare il mount del dispositivo %s?"
+"La tabella delle partizioni del disco %s sta per essere scritta su disco!"
 
-#: ../../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 ""
-"Non puoi deselezionare punti di mount perch� questa partizione � usata\n"
-"per il loopback. Prima rimuovi il loopback"
+"Sar� necessario riavviare il sistema prima che le modifiche diventino "
+"effettive!"
 
-#: ../../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 ""
 "Dopo aver formattato la partizione %s, tutti i dati su questa partizione "
 "saranno persi"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Formattazione"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formattazione file di 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 "Formattazione partizione %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Dopo la formattazione di tutte le partizioni,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "tutti i dati su queste partizioni saranna persi"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Sposta"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Su quale disco vuoi spostarlo?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Settore"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid fallito"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Su che settore vuoi spostarlo?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Non c'� abbastanza spazio libero per allocare nuove partizioni"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Spostamento"
+#: ../../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 "Spostamento partizione..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Non c'� abbastanza spazio libero per allocare nuove partizioni"
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:910
 #, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
+msgid "Copying %s"
 msgstr ""
-"La tabella delle partizioni del disco %s sta per essere scritta su disco!"
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr ""
-"Sar� necessario riavviare il sistema prima che le modifiche diventino "
-"effettive!"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Risoluzione: %s\n"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Calcolo dei vincoli del filesystem FAT"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Dispositivo: "
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Ridimensionamento"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "Lettera di drive DOS: %s (solo una supposizione)\n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Questa partizione non � ridimensionabile"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Tipo: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Dovresti eseguire il backup di tutti i dati su questa partizione"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Nome: "
 
-#: ../../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 ""
-"Dopo aver ridimensionato la partizione %s, tutti i dati su questa partizione "
-"saranno persi"
+msgid "Start: sector %s\n"
+msgstr "Inizia: settore %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Scegli la nuova dimensione"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Dimensione: %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 settori"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Crea una nuova partizione"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Da cilindro %d a cilindro %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Settore iniziale: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Formattato\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Dimensione in Mb: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Non formattato\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Tipo di filesystem: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "In linea\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Preferenza: "
+#: ../../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 "Questa partizione non pu� essere usata per il loopback"
+#: ../../diskdrake_interactive.pm_.c:965
+#, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr ""
+"File di loopback:\n"
+"   %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 ""
+"Partizione di boot predefinita\n"
+"    (per boot MS-DOS, non per lilo)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Nome file loopback: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Livello %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "File gi� usato da un altro loopback, selezionane uno diverso"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Dimensione del blocco %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Il file esiste gi�. Lo uso?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "Dischi RAID %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Scegli file"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Nome file di 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 copia di sicurezza della tabella delle partizioni non ha la stessa\n"
-"dimensione. Continuo comunque?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Attenzione"
+"\n"
+"Molto probabilmente questa partizione �\n"
+"una partizione Driver, � meglio\n"
+"non toccarla.\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 ""
-"Inserisci un floppy nel drive\n"
-"Tutti i dati su questo floppy saranno persi"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Provo a recuperare la tabella delle partizioni"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "dispositivo"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "livello"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "dimensione del blocco"
+"\n"
+"Questa speciale partizione di boot\n"
+"viene utilizzata per effettuare\n"
+"il dual-boot del tuo sistema.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Scegli un RAID esistente a cui effettuare l'aggiunta"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Dimensione: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "nuovo"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometria: %s cilindri, %s testine, %s settori\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Scegli un LVM esistente a cui effettuare l'aggiunta"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "Nome LVM?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "Dischi LVM %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Automounting di media rimovibili"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Tipo tabella delle partizioni: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Recupera tabella delle partizioni"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "su bus %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Ricarica"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Opzioni: %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 formattazione di %s fallita"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Non so come formattare %s in tipo %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "mount fallito"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr "fsck � fallito con codice di uscita %d o segnale %d"
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "mount fallito: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "errore in fase di unmount di %s: %s"
@@ -1876,39 +2010,42 @@ msgstr "semplice"
 msgid "server"
 msgstr "server"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Non puoi usare JFS per partizioni pi� piccole di 16 Mb"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Non puoi usare ReiserFS per partizioni pi� piccole di 32MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "I punti di mount devono iniziare con /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "C'� gi� una partizione con il punto di mount %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Mount circolari %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 "Non puoi usare un Volume Logico LVM per il punto di mount %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Questa directory dovrebbe rimanere all'interno del filesystem root"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr "� un vero filesystem (ext2, reiserfs) per questa punto di mount\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Errore aprendo %s in scrittura: %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"
@@ -1917,478 +2054,946 @@ msgstr ""
 "creare nuovi filesystem. Per favore controlla il tuo hardware per stabilire "
 "la causa di questo problema"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Non hai alcuna partizione!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr ""
-"Seleziona la lingua desiderata per l'installazione e l'uso del sistema."
-
-#: ../../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 ""
-"Devi accettare i termini della licenza qui sopra per continuare "
-"l'installazione.\n"
-"\n"
-"\n"
-"Per favore clicca su \"Accetta\" se sei d'accordo con i suoi termini.\n"
-"\n"
-"\n"
-"Per favore clicca su \"Rifiuta\" se non sei d'accordo con i suoi termini.\n"
-"L'installazione finir� senza modificare la configurazione corrente."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Scegli l'impostazione della tua tastiera dalla lista qui sopra"
-
-#: ../../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 ""
-"Se lo desideri, altre lingue (oltre a quella da te scelto all'inizio\n"
-"dell'installazione) saranno disponibili dopo l'installazione, per favore\n"
-"sceglile dalla lista qui sopra. Se vuoi sceglierle tutte, devi solo\n"
-"selezionare \"Tutte\"."
-
-#: ../../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"
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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 ""
+"GNU/Linux � un sistema operativo multiutente, e questo significa che\n"
+"ciascun utente pu� disporre di una configurazione personalizzata, di uno\n"
+"spazio per i propri file, e cos� via; consultate il ''Manuale dell'utente''\n"
+"per saperne di pi�. Ma, a differenza di \"root\", che � l'amministratore\n"
+"del sistema, gli utenti che aggiungerete adesso non avranno il diritto di\n"
+"cambiare nulla, se non i propri file e la propria configurazione. Dovrete\n"
+"crearne almeno uno per voi stessi, e dovreste usare quello per l'uso\n"
+"quotidiano: per quanto sia molto comodo entrare nel sistema come \"root\"\n"
+"tutti i giorni, potrebbe anche essere molto pericoloso! Anche un errore\n"
+"banale potrebbe significare un sistema non pi� in grado di funzionare\n"
+"correttamente. Se, invece, commettete un errore, anche grave, in qualit� di\n"
+"utente normale, potreste perdere parte dei vostri dati, ma non\n"
+"compromettere l'intero sistema.\n"
+"\n"
+"Prima di tutto, inserite il vostro nome reale. Naturalmente questo non �\n"
+"obbligatorio: potete digitare quello che volete. Fatto questo, DrakX\n"
+"prender� la prima parola che avete inserito nel campo di testo e la copier�\n"
+"alla voce \"Nome utente\". Questo � il nome che l'utente dovr� usare per\n"
+"accedere al sistema, ma potete cambiarlo. Poi digitate una password per\n"
+"questo utente. La password di un utente non privilegiato dal punto di vista\n"
+"della sicurezza non � cruciale come quella di \"root\", ovviamente, ma non\n"
+"c'� motivo di essere frettolosi: dopo tutto, si tratta dei vostri file.\n"
+"\n"
+"Se cliccate su \"Accetta utente\", potrete poi aggiungerne un altro, e\n"
+"altri ancora, a vostra discrezione. Aggiungete un utente per ciascuno dei\n"
+"vostri amici, oppure per vostro padre e vostro fratello, ad esempio. Dopo\n"
+"aver aggiunto tutti gli utenti che volete, selezionate \"Fatto\".\n"
+"\n"
+"Cliccando sul pulsante \"Avanzato\" potrete cambiare la \"shell\" per\n"
+"quell'utente (come opzione predefinita � bash)."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+#: ../../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"
-"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 ""
-"Per favore scegli \"Installa\" se non hai una precedente versione di Linux-"
-"Mandrake\n"
-"installata o se vuoi usare pi� sistemi operativi.\n"
-"\n"
+"Qui sopra sono elencate le partizioni Linux esistenti individuate sul tuo\n"
+"disco rigido. Puoi tenere le scelte fatte dal wizard, sono buone per un\n"
+"uso comune. Se cambi queste scelte, devi definire almeno una partizione\n"
+"root (\"/\"). Non scegliere una partizione troppo piccola on non potrai\n"
+"installare abbastanza software. Se vuoi salvare i tuoi dati su una\n"
+"partizione separata, hai bisogno anche di una \"/home\" (possibile solo\n"
+"se hai pi� di una partizione Linux disponibile).\n"
 "\n"
-"Per favore scegli \"Aggiorna\" se desideri aggiornare una versione di Linux-"
-"Mandrake gi� installata.\n"
 "\n"
+"Per informazione, ogni partizione � elencata come segue: \"Nome\", \"Capacit�"
+"\".\n"
 "\n"
-"In base alla tua conoscenza di GNU/Linux, puoi scegliere uno dei seguenti "
-"livelli per installare o aggiornare\n"
-"il tuo sistema operativo Linux-Mandrake:\n"
-"\t* Raccomandata: se non hai mai installato il sitema operativo GNU/Linux "
-"scegli questa. L'installazione\n"
-"\t  sar� molto semplice e ti verranno poste solo poche domande.\n"
 "\n"
+"\"Nome\" � codificato come segue: \"tipo hard disk\", \"numero hard disk\",\n"
+"\"numero partizione\" (per esempio, \"hda1\").\n"
 "\n"
-"\t* Personalizzata: se hai abbastanza familiarit� con GNU/Linux, puoi "
-"scegliere l'uso primario (workstation, server,\n"
-"\t  sviluppo) del tuo sistema. Dovrai rispondere a pi� domande che nella "
-"classe d'installazione \"Raccomandata\",\n"
-"\t  perci� devi sapere come funziona GNU/linux per scegliere questa classe "
-"d'installazione.\n"
 "\n"
+"\"Tipo hard disk\" � \"hd\" se il tuo disco fisso � di tipo IDE e \"sd\" se\n"
+"� uno SCSI.\n"
 "\n"
-"\t* Esperto: se hai una buona conoscenza di GNU/Linux, puoi scegliere questa "
-"classe d'installazione. Come nella classe d'installazione\n"
-"\t  \"Personalizzata\", potrai scegliere l'uso primario (workstation, "
-"server, sviluppo). Stai molto attento prima di selezionare questa classe\n"
-"\t  d'installazione. Sarai in grado di effettuare una installazione "
-"altamente personalizzata.\n"
-"\t  Rispondere ad alcune domande pu� essere molto difficile se non hai una "
-"buona conoscenza di GNU/Linux. Quindi non scegliere questa classe\n"
-"\t  d'installazione se non sai cosa stai facendo."
-
-#: ../../help.pm_.c:56
-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"
+"\"Numero hard disk\" � sempre una lettera dopo \"hd\" o \"sd\". Con dischi\n"
+"fissi IDE:\n"
 "\n"
+"   * \"a\" significa \"disco fisso master sul controller IDE primario\",\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 ""
-"Seleziona:\n"
+"   * \"b\" significa \"disco fisso slave sul controller IDE primario\",\n"
 "\n"
+"   * \"c\" significa \"disco fisso master sul controller IDE secondario\",\n"
 "\n"
-"  - Personalizzata: sei hai familiarit� con GNU/Linux, sarai in grado di \n"
-"scegliere l'utilizzo normale del tuo computer. Vedi pi� avanti per \n"
-"ulteriori dettagli.\n"
+"   * \"d\" significa \"disco fisso slave sul controller IDE secondario\",\n"
 "\n"
 "\n"
-"  - Esperto: se conosci bene GNU/Linux e vuoi effettuare una installazione\n"
-"altamente personalizzata, questa classe d'installazione � per te. Sarai in\n"
-"grado di scegliere l'utilizzo del tuo sistema installato come per \n"
-"\"Personalizzata\"."
+"Con dischi fissi SCSI, una \"a\" significa \"disco fisso primario\", una \"b"
+"\"\n"
+"significa \"disco fisso secondario\", etc."
 
-#: ../../help.pm_.c:68
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:72
 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"
-"\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"
-"\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 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 ""
-"Adesso devi indicare l'uso principale per questa macchina. Puoi scegliere "
-"tra:\n"
-"\n"
-"\t* Workstation: la scelta ideale se intendi usare questo computer "
-"principalmente per\n"
-"\t  l'uso di ogni giorno, in ufficio o a casa.\n"
-"\n"
-"\n"
-"\t* Sviluppatore: se intendi usare la tua macchina soprattutto per lo "
-"sviluppo di software, questa �\n"
-"\t  una buona scelta. Verr� installata una raccolta completa del software "
-"necessario a formattare, compilare ed effettuare\n"
-"\t  il debug del tuo codice sorgente, come pure per creare pacchetti "
-"software.\n"
-"\n"
-"\n"
-"\t* Server: la scelta migliore se intendi usare questa macchina come server. "
-"Pu� trattarsi di un server\n"
-"\t  di file (NFS o SMB), un server di stampa (in stile Unix o Windows),\n"
-"\t  un server di autentificazione (NIS), un server di database, e cos� via.\n"
-"\t  Trattandosi di un server, non aspettarti che vengano installati fronzoli "
-"di vario tipo (KDE, GNOME, etc.)."
+"La distribuzione Mandrake Linux � suddivisa su pi� CDROM. DrakX sa se uno\n"
+"dei pacchetti selezionati si trova su un altro CDROM, pertanto provveder� a\n"
+"espellere il CDROM attualmente inserito nel lettore e a chiedervi di\n"
+"inserire quello corretto."
 
-#: ../../help.pm_.c:84
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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"
-"\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)."
+"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"
+"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 ""
+"Adesso � il momento di indicare i programmi che volete siano installati sul\n"
+"vostro sistema. Ci sono migliaia di programmi disponibili per Mandrake\n"
+"Linux, e nessuno si aspetta che li conosciate tutti a memoria.\n"
+"\n"
+"Se state effettuando un'installazione standard da CDROM, per prima cosa vi\n"
+"verr� chiesto di specificare i CD in vostro possesso: controllate i CD\n"
+"della distribuzione, cliccate sulle caselle corrispondenti ai CD che avete\n"
+"e infine sul pulsante \"Ok\" quando siete pronti per continuare.\n"
+"\n"
+"I pacchetti sono organizzati in gruppi corrispondenti a usi particolari\n"
+"della vostra macchina. I gruppi sono a loro volta divisi in quattro\n"
+"sezioni:\n"
+"\n"
+" * \"Workstation\": scegliete uno o pi� dei gruppi di questa sezione se la\n"
+"vostra macchina verr� utilizzata prevalentemente come workstation.\n"
+"\n"
+" * \"Ambiente grafico\": scegliete qui il vostro ambiente grafico "
+"preferito.\n"
+"Indicatene almeno uno se desiderate avere una workstation grafica!\n"
+"\n"
+" * \"Sviluppo\": se la macchina verr� usata per lo sviluppo di software\n"
+"scegliete i gruppi appropriati.\n"
+"\n"
+" * \"Server\": se la macchina sar� usata come server, infine, qui potrete\n"
+"scegliere i servizi pi� comuni che verranno installati.\n"
+"\n"
+"Spostando il puntatore del mouse sul nome di un gruppo verr� mostrato un\n"
+"breve testo di informazioni riguardo quest'ultimo.\n"
+"\n"
+"Se lo desiderate, potete scegliere l'opzione \"Selezione individuale dei\n"
+"pacchetti\". Questa � utilissima se conoscete bene i pacchetti presenti\n"
+"nella distribuzione o se desiderate avere il totale controllo di ci� che\n"
+"verr� installato.\n"
+"\n"
+"Se avete cominciato l'installazione in modalit� \"Aggiornamento\", potete\n"
+"deselezionare tutti i gruppi per evitare di installare nuovi pacchetti, in\n"
+"questo modo effettuerete soltanto il ripristino o l'aggiornamento del\n"
+"sistema esistente."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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"
+"!! 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"
+"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 ""
+"Ora, se avete scelto di indicare i pacchetti su base individuale, potete\n"
+"vedere una struttura ad albero contenente tutti i pacchetti organizzati in\n"
+"gruppi e sotto-gruppi. Mentre sfogliate questa lista gerarchica potete\n"
+"selezionare interi gruppi, sotto-gruppi o singoli pacchetti.\n"
+"\n"
+"Quando selezionate un pacchetto all'interno dell'albero, ne compare una\n"
+"descrizione sulla destra. Una volta terminata la scelta, cliccate sul\n"
+"pulsante \"Installa\" che provveder� a far partire l'installazione vera e\n"
+"propria. Il tempo necessario varia in base al numero di pacchetti che\n"
+"devono essere installati e alla velocit� del vostro hardware, l'attesa\n"
+"potrebbe anche essere lunga. Una stima del tempo richiesto per finire\n"
+"l'installazione � visibile sullo schermo, in questo modo potrete sapere se\n"
+"avete tempo a sufficienza per godervi una tazza di caff�.\n"
+"\n"
+"!! Se avete selezionato un pacchetto che offre un servizio come server\n"
+"(intenzionalmente, oppure perch� faceva parte di un gruppo), vi verr�\n"
+"chiesta conferma riguardo una sua effettiva installazione. Come opzione\n"
+"predefinita, in Mandrake Linux tutti i servizi installati vengono avviati\n"
+"automaticamente al momento del boot. Anche se si tratta di servizi sicuri\n"
+"al momento in cui � stata rilasciata questa versione della distribuzione,\n"
+"potrebbe succedere che vengano scoperte delle falle di sicurezza in un\n"
+"momento successivo. Se poi non avete proprio idea di quale sia la funzione\n"
+"di uno di questi pacchetti, cliccate sul pulsante \"No\". Cliccando su\n"
+"\"S�\" i servizi elencati verranno installati e saranno attivati in maniera\n"
+"automatica. !!\n"
+"\n"
+"Disattivando l'opzione \"Mostra i pacchetti selezionati automaticamente\"\n"
+"potete disabilitare la finestra di dialogo che compare tutte le volte che\n"
+"il programma di installazione seleziona automaticamente uno o pi�\n"
+"pacchetti. Il programma determina in modo automatico, infatti, quali sono i\n"
+"pacchetti che sono indispensabili a un dato pacchetto (''dipendenze'')\n"
+"perch� quest'ultimo possa essere installato con successo.\n"
+"\n"
+"Il piccolo dischetto floppy in fondo alla lista vi permette di caricare una\n"
+"lista di pacchetti scelti durante una precedente installazione. Cliccando\n"
+"su questa icona vi verr� chiesto di inserire un floppy che avrete creato\n"
+"alla fine di un'altra installazione. Consultate le informazioni che\n"
+"riguardano l'ultimo passo del processo di installazione per sapere come\n"
+"creare questo dischetto."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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"
+"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 wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
+msgstr ""
+"Se desiderate connettere il vostro computer a Internet o a una rete locale,\n"
+"assicuratevi di scegliere l'opzione corretta. Accendete la periferica che\n"
+"dovrete usare per connettervi prima di scegliere l'opzione adeguata, per\n"
+"permettere a DrakX di individuarla automaticamente.\n"
+"\n"
+"Mandrake Linux vi permette di configurare la vostra connessione a Internet\n"
+"durante il processo di installazione. Le connessioni disponibili sono:\n"
+"modem tradizionale, modem ISDN, connessione ADSL, connessione via cavo, e\n"
+"infine una semplice connessione a una LAN (Ethernet).\n"
+"\n"
+"Non possiamo descrivere in dettaglio le caratteristiche di ogni\n"
+"configurazione. In ogni caso, accertatevi di avere a portata di mano tutti\n"
+"i parametri indicati dal vostro fornitore di servizi internet o dal vostro\n"
+"amministratore di sistema.\n"
+"\n"
+"Per maggiori dettagli riguardo la configurazione della connessione a\n"
+"Internet potete consultare il capitolo che tratta specificamente questo\n"
+"argomento; in alternativa potete attendere di aver portato a termine\n"
+"l'installazione e usare poi il programma descritto in tale capitolo per\n"
+"configurare la connessione.\n"
+"\n"
+"Se desiderate configurare la rete dopo aver terminato l'installazione, o se\n"
+"avete gi� configurato la vostra rete, cliccate su \"Annulla\"."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:172
+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"
+"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 ""
+"A questo punto potete scegliere i servizi da lanciare automaticamente\n"
+"all'avvio del sistema.\n"
+"\n"
+"Qui sono elencati tutti i servizi disponibili con l'installazione attuale.\n"
+"Esaminateli attentamente e disabilitate quelli che non sono sempre\n"
+"necessari all'avvio.\n"
+"\n"
+"Selezionando un servizio comparir� un breve testo di aiuto che ne spiega le\n"
+"caratteristiche. Se non siete realmente sicuri dell'utilit� o meno di un\n"
+"servizio, � pi� prudente non modificare le impostazioni predefinite.\n"
+"\n"
+"In questa fase dell'installazione dovete fare le vostre scelte con\n"
+"particolare attenzione nel caso intendiate usare il vostro computer come\n"
+"server: probabilmente non volete che siano abilitati servizi di cui non\n"
+"avete bisogno. Ricordate che numerosi servizi sono potenzialmente\n"
+"pericolosi se attivi su un server. Come regola generale, selezionate\n"
+"soltanto quelli di cui avete effettivamente bisogno."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+#: ../../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 ""
-"DrakX prover� a cercare adattatori SCSI su schede PCI. \n"
-"Se DrakX trova un adattatore SCSI e sa quale driver usare, lo \n"
-"installer� automaticamente.\n"
-"\n"
-"Se non hai adattatori SCSI, hai un adattatore SCSI su scheda ISA, o un "
-"adattatore SCSI\n"
-" su scheda PCI che DrakX non riconosce, ti verr� chiesto se nel tuo sistema "
-"� presente un\n"
-"adattatore SCSI. Se non ne hai, clicca su \"No\". Se clicchi su \"S�\", ti\n"
-"verr� proposta una lista di driver tra cui scegliere quello adatto al tuo "
-"adattatore.\n"
-"\n"
-"\n"
-"Se devi specificare manualmente il tuo adattatore, DrakX ti chieder� se "
-"vuoi\n"
-"specificare delle opzioni. Dovresti lasciare che sia DrakX a ispezionare\n"
-"l'hardware per le opzioni. Di solito funziona bene.\n"
-"\n"
-"In caso contrario, dovrai fornire le opzioni per il driver.\n"
-"Consulta la Guida all'Installazione (capitolo 3., sezione \"Raccolta di  "
-"informazioni  sul  vostro  hardware\") per suggerimenti su come recuperare\n"
-"queste informazioni da Windows (se � installato sul tuo sistema), dalla\n"
-"documentazione dell'hardware, o dal sito web del costruttore (se hai\n"
-"accesso a internet)."
-
-#: ../../help.pm_.c:108
+"GNU/Linux gestisce il tempo in GMT, o \"Greenwich Mean Time\", e lo traduce\n"
+"in tempo locale secondo la fascia oraria da te scelta."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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"
+"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 ""
+"X (che sta per X Window System) � il cuore dell'interfaccia grafica di\n"
+"GNU/Linux, sulla quale sono basati tutti gli ambienti grafici che sono\n"
+"inclusi in Mandrake Linux (KDE, GNOME, Afterstep, Windowmaker...). In\n"
+"questa sezione, DrakX tenter� di configurare X automaticamente.\n"
+"\n"
+"� molto raro che non abbia successo: l'unico caso in cui ci� potrebbe\n"
+"accadere � se l'hardware in questione � molto vecchio (o molto recente). Se\n"
+"l'operazione riesce, DrakX lancer� X automaticamente, con la miglior\n"
+"risoluzione possibile, in base alle dimensioni del monitor. A quel punto,\n"
+"comparir� una finestra che vi chieder� se potete vederla.\n"
+"\n"
+"Se state effettuando un'installazione in modo \"Esperto\", verr� lanciato\n"
+"l'assistente di configurazione di X. Consultate la sezione del manuale\n"
+"dedicata a questo assistente per avere pi� informazioni al riguardo.\n"
+"\n"
+"Se potete vedere il messaggio e rispondete \"S�\", allora DrakX passer�\n"
+"alla fase successiva. Se non potete vedere il messaggio, significa che la\n"
+"configurazione non andava bene, e il test terminer� automaticamente dopo 10\n"
+"secondi, riportandovi alla schermata precedente."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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 ""
+"Pu� verificarsi il caso che il primo tentativo non sia quello giusto (lo\n"
+"schermo � troppo piccolo, spostato a destra o a sinistra...). Questo � il\n"
+"motivo per cui, anche se X viene lanciato correttamente, DrakX vi chieder�\n"
+"subito dopo se la configurazione va bene, e vi proporr� di cambiarla\n"
+"elencando una lista di modi video validi (in base a quello che ha potuto\n"
+"accertare) chiedendovi di sceglierne uno.\n"
+"\n"
+"Come ultima risorsa, se proprio non riuscite a far funzionare X, scegliete\n"
+"\"Cambia scheda grafica\", selezionate \"Unlisted card\", e quando vi verr�\n"
+"chiesto quale server desiderate utilizzare, scegliete \"FBDev\": si tratta\n"
+"di un'opzione a prova d'errore, che funziona con qualsiasi scheda grafica\n"
+"moderna. Quindi scegliete \"Nuovo test\" per essere sicuri."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:224
 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"
+"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 ""
+"Infine DrakX vi chieder� se desiderate utilizzare l'interfaccia grafica una\n"
+"volta terminato il processo di avvio del sistema. Notate che questa domanda\n"
+"verr� fatta anche se avete deciso di non provare la configurazione.\n"
+"Ovviamente dovrete scegliere \"No\" se la vostra macchina dovr� svolgere il\n"
+"ruolo di server, o se non siete riusciti a ottenere una configurazione\n"
+"corretta."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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"
+" * 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"
+"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 ""
+"Il CDROM di Mandrake Linux ha una modalit� ''salvataggio'' preconfigurata.\n"
+"Potete accedervi effettuando il boot dal CDROM, premendo il tasto >>F1<<\n"
+"all'avvio e digitando >>rescue<< dal prompt. Ma se il vostro computer non\n"
+"pu� essere avviato dal CDROM, dovete effettuare questa operazione (la\n"
+"creazione di un disco di avvio) per almeno due ragioni:\n"
+"\n"
+" * DrakX riscriver� il settore di boot (MBR) del vostro disco principale (a\n"
+"meno che voi non usiate un altro gestore del boot), in modo che possiate\n"
+"avviare sia Windows che GNU/Linux, se avete anche Windows sul vostro\n"
+"sistema. Tuttavia, se in futuro si render� necessario re-installare\n"
+"Windows, il programma di installazione Microsoft riscriver� il settore di\n"
+"boot, e di conseguenza non sarete pi� in grado di avviare GNU/Linux!\n"
+"\n"
+" * se si verifica un problema per cui non potete pi� lanciare GNU/Linux dal\n"
+"disco rigido, questo disco floppy sar� l'unico mezzo per avviare GNU/Linux:\n"
+"contiene un buon numero di programmi di amministrazione del sistema per\n"
+"rimettere in sesto un'installazione che ha subito abbia crash per\n"
+"un'interruzione di corrente, uno sfortunato errore di battitura o qualsiasi\n"
+"altra ragione.\n"
+"\n"
+"Quando cliccherete su \"S�\", vi verr� chiesto di inserire un disco in un\n"
+"lettore di floppy. Naturalmente il dischetto che utilizzerete deve essere\n"
+"vuoto o contenere soltanto dati di cui non avete pi� bisogno. Non sar�\n"
+"necessario formattarlo: DrakX riscriver� l'intero disco."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:255
+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 "
-"user.\n"
-"This wizard simplifies this process. Before beginning, please consult the "
-"manual\n"
-"and take your time.\n"
-"\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"
-"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"
+"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"
-"\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"
+" * \"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"
+" * \"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"
+" * \"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 ""
+"A questo punto dovete scegliere dove installare il vostro sistema operativo\n"
+"Mandrake Linux sul disco rigido. Se il vostro disco � vuoto, oppure se un\n"
+"sistema operativo esistente sta usando tutto lo spazio disponibile, allora\n"
+"dovrete partizionarlo. In breve, partizionare un disco rigido consiste nel\n"
+"suddividerlo logicamente in maniera da creare lo spazio sufficiente per\n"
+"installare il vostro nuovo sistema operativo Mandrake Linux.\n"
+"\n"
+"Dato che gli effetti del partizionamento sono di solito irreversibili,\n"
+"questa operazione pu� intimidire e rivelarsi stressante per un utente\n"
+"inesperto. Fortunatamente, avete a vostra disposizione un assistente che\n"
+"semplifica questo passo. Prima di iniziare leggete attentamente il manuale,\n"
+"e prendete tutto il tempo che vi serve.\n"
+"\n"
+"Se state effettuando l'installazione in modalit� Esperto, verr� lanciato\n"
+"DiskDrake, il programma di gestione e partizionamento dei dischi rigidi di\n"
+"Mandrake Linux, che vi permetter� di configurare accuratamente le vostre\n"
+"partizioni. Consultate il capitolo relativo a DiskDrake (''Gestione delle\n"
+"partizioni'') nel manuale. Potete usare gli assistenti descritti qui di\n"
+"seguito cliccando sul pulsante \"Assistente\" (ingl. \"Wizard\").\n"
+"\n"
+"Se le partizioni sono gi� state definite (per una precedente installazione,\n"
+"o da un'altra utilit� di partizionamento), dovrete solo scegliere quelle da\n"
+"usare per installare il vostro sistema Linux.\n"
+"\n"
+"Se le partizioni non sono ancora state definite, dovete crearle usando\n"
+"l'assistente. In base alla configurazione del vostro disco rigido, saranno\n"
+"disponibili diverse soluzioni:\n"
+"\n"
+" * \"Usa spazio disponibile\": questa opzione causer� un partizionamento\n"
+"automatico del vostro disco rigido (o dischi, se ne avete pi� di uno). Non\n"
+"vi verr� posta nessun'altra domanda.\n"
+"\n"
+" * \"Usa partizioni esistenti\": l'assistente ha trovato una o pi�\n"
+"partizioni Linux sul vostro disco rigido. Se desiderate usarle scegliete\n"
+"questa opzione.\n"
+"\n"
+" * \"Usa lo spazio libero nella partizione Windows\": se Microsoft Windows "
+"�\n"
+"installato sul vostro disco rigido e occupa tutto lo spazio disponibile,\n"
+"dovrete creare spazio libero per i dati relativi a Linux. Per farlo potete\n"
+"cancellare la vostra partizione Microsoft Windows e i dati che contiene\n"
+"(usando le soluzioni \"Cancella l'intero disco\" o \"Modo Esperto\"),\n"
+"oppure ridimensionare la vostra partizione Microsoft Windows. Il\n"
+"ridimensionamento pu� essere effettuato evitando la perdita di dati. Questa\n"
+"� la soluzione consigliata se desiderate usare sia Mandrake Linux sia\n"
+"Microsoft Windows sullo stesso computer.\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"
+"   Prima di scegliere questa soluzione, tenete presente che la dimensione\n"
+"della partizione su cui risiede Microsoft Windows sar� ridotta rispetto a\n"
+"quella attuale. Significa che avrete meno spazio libero per archiviare i\n"
+"vostri dati o installare nuovo software su Windows.\n"
 "\n"
+" * \"Cancella l'intero disco\": se desiderate cancellare tutti i dati e\n"
+"tutte le partizioni presenti sul vostro disco rigido e rimpiazzarli con il\n"
+"vostro nuovo sistema Mandrake Linux, potete selezionare questa opzione.\n"
+"Fate attenzione nello scegliere questa soluzione, dopo la conferma non\n"
+"potrete pi� tornare indietro.\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"
+"   !! Se scegliete questa opzione, tutti i dati sul vostro disco andranno\n"
+"persi. !!\n"
 "\n"
+" * \"Cancella Windows\": l'effetto di questa opzione sar� di cancellare\n"
+"tutto quello che si trova sul disco e di ricominciare da capo, creando le\n"
+"partizioni su un disco vuoto. Tutti i dati presenti sul vostro disco\n"
+"andranno persi.\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."
-msgstr ""
-"A questo punto devi scegliere dove installare il sistema operativo\n"
-"Linux-Mandrake sul tuo disco fisso. Se � vuoto o se un sistema operativo\n"
-"preesistente usa tutto lo spazio disponibile, devi partizionarlo. \n"
-"Fondamentalmente, partizionare un disco fisso consiste nel suddividerlo\n"
-"logicamente per creare spazio per installare il tuo sistema Linux-Mandrake.\n"
+"   !! Se scegliete questa opzione, tutti i dati sul vostro disco andranno\n"
+"persi. !!\n"
 "\n"
+" * \"Modo Esperto\": se volete partizionare manualmente il vostro disco\n"
+"rigido potete scegliere questa opzione. Fate attenzione prima di optare per\n"
+"questa soluzione: � potente, ma molto pericolosa. Potreste facilmente\n"
+"causare la perdita di tutti i vostri dati. Quindi, non scegliete questa\n"
+"soluzione se non sapete cosa state facendo."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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"
-"Poich� gli effetti del partizionamento sono di solito irreversibili, tale\n"
-"operazione pu� intimidire ed essere stressante se sei un utente\n"
-"inesperto. Questo wizard semplifica il processo. Prima di iniziare, per\n"
-"favore consulta il manuale e prendi tutto il tempo che ti serve.\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"
-"Hai bisogno di almeno due partizioni. Una � per il sistema operativo "
-"stesso,\n"
-"e l'altra per la memoria virtuale (detta anche Swap).\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"
-"Se le partizioni sono gi� stata definite (per una precedente installazione\n"
-"o da un'altra utilit� di partizionamento), hai solo bisogno di scegliere \n"
-"quelle da usare per installare il tuo sistema Linux.\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"
-"Se le partizioni non sono ancora state definite, devi crearle. Per farlo,\n"
-"usa il wizard disponibile sopra. Secondo la configurazione del tuo disco\n"
-"fisso, saranno disponibili diverse soluzioni:\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"
-"\t* Usa partizioni esistenti: il wizard ha trovato una o pi� partizioni "
-"Linux esistenti sul tuo disco rigido.\n"
-"\t  Se vuoi mantenerle, scegli questa opzione. \n"
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
+msgstr ""
+"Ecco fatto: l'installazione � terminata, e il vostro sistema GNU/Linux �\n"
+"pronto per essere usato. Dovete soltanto cliccare sul pulsante \"OK\" per\n"
+"riavviare il sistema. Potete lanciare GNU/Linux o Windows (se presente),\n"
+"qualunque preferiate dei due, non appena il computer avr� terminato di\n"
+"effettuare il boot.\n"
 "\n"
+"Cliccando sul pulsante \"Avanzato\" avrete altri due pulsanti a vostra\n"
+"disposizione:\n"
 "\n"
-"\t* Cancella l'intero disco: se vuoi cancellare tutti i dati e tutte le "
-"partizioni presenti sul tuo disco fisso e\n"
-"\t  rimpiazzarli con il tuo nuovo sistema Linux-Mandrake, puoi scegliere "
-"questa opzione. Fai attenzione nello scegliere questa\n"
-"\t  soluzione, dopo la conferma non potrai tornare indietro.\n"
+" * \"Crea il floppy di auto installazione\": per creare un floppy di\n"
+"installazione che permette di eseguire automaticamente un' installazione\n"
+"completa, del tutto simile a quella che avete appena finito di configurare,\n"
+"senza che sia necessario l'intervento di un operatore.\n"
 "\n"
+"   Notate che, dopo aver cliccato sul pulsante, saranno disponibili due\n"
+"opzioni diverse:\n"
 "\n"
-"\t* Usa lo spazio libero nella partizione Windows: se Microsoft Windows � "
-"installato sul tuo disco rigido e occupa\n"
-"\t  tutto lo spazio disponibile, devi creare spazio libero per i dati Linux. "
-"Per farlo puoi cancellare la tua\n"
-"\t  partizione Microsoft Windows e i dati (vedi \"Cancella l'intero disco\" "
-"o \"Modo Esperto\"), oppure ridimensionare\n"
-"\t  la tua partizione Microsoft Windows. Il ridimensionamento pu� essere "
-"effettuato evitando la perdita di dati.\n"
-"\t  Questa soluzione � raccomandata se vuoi usare sia Linu-Mandrake che "
-"Microsoft Windows sullo stesso computer.\n"
+"    * \"Ripeti\": questa � un'installazione automatizzata solo in parte, in\n"
+"quanto la fase di partizionamento del disco (e solo quella) resta\n"
+"interattiva.\n"
 "\n"
+"    * \"Automatizzata\": l'installazione � completamente automatizzata: il\n"
+"disco rigido viene riscritto per intero, tutti i dati andranno persi.\n"
 "\n"
-"\t  Prima di scegliere questa soluzione, per favore renditi conto che la "
-"dimensione della partizione Microsoft\n"
-"\t  Windows sar� inferiore a quella corrente. Significa che avrai meno "
-"spazio libero sotto Microsoft Windows per\n"
-"archiviare i tuoi dati o installare nuovo software.\n"
+"   Questa caratteristica � molto utile quando si deve installare il sistema "
+"su\n"
+"un gran numero di macchine dalle caratteristiche simili. Si veda la sezione\n"
+"Installazione automatica sul nostro sito web.\n"
 "\n"
+" * \"Salva scelta pacchetti\"(*): salva la selezione dei pacchetti\n"
+"effettuata in precedenza. Al momento di effettuare un'altra installazione,\n"
+"potrete inserire il dischetto nel lettore e installare il sistema\n"
+"richiamando lo schermo di aiuto (premendo [F1]) e digitando >>linux\n"
+"defcfg=\"floppy\"<<.\n"
 "\n"
-"\t* Modo Esperto: se vuoi partizionare manualmente il tuo disco fisso, puoi "
-"scegliere questa opzione. Fai\n"
-"\t  attenzione prima di scegliere questa soluzione. � potente, ma molto "
-"pericolosa. puoi perdere molto\n"
-"\t  facilmente tutti i tuoi dati. Quindi, non scegliere questa soluzione se "
-"non sai cosa stai facendo."
+"(*) Sar� necessario un dischetto formattato con il filesystem FAT: per\n"
+"formattarne uno sotto GNU/Linux digitate \"mformat a:\""
 
-#: ../../help.pm_.c:160
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:350
 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 ""
+"Qualsiasi partizione appena definita deve essere formattata prima di poter\n"
+"essere usata (formattare significa creare un filesystem).\n"
 "\n"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\n"
+"Potreste anche voler riformattare alcune partizioni preesistenti, per\n"
+"cancellare i dati che contengono. Se desiderate farlo, scegliete qui le\n"
+"partizioni che intendete formattare.\n"
 "\n"
+"Tenete presente che non � assolutamente necessario riformattare tutte le\n"
+"partizioni preesistenti. Dovete formattare le partizioni che contengono il\n"
+"sistema operativo (come \"/\", \"/usr\" o \"/var\"), ma potete evitare di\n"
+"riformattare partizioni che contengono dati che desiderate conservare\n"
+"(tipicamente \"/home\").\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"
+"Fate molta attenzione nella scelta delle partizioni, dopo la formattazione\n"
+"tutti i dati saranno cancellati e non potrete recuperarli.\n"
 "\n"
+"Cliccate su \"Ok\" quando siete pronti a formattare le partizioni.\n"
 "\n"
-"   * Undo: you can use this option to cancel your changes.\n"
+"Cliccate su \"Annulla\" se desiderate scegliere altre partizioni sulle\n"
+"quali installare il vostro nuovo sistema operativo Mandrake Linux.\n"
 "\n"
+"Cliccate su \"Avanzato\" se desiderate che le partizioni selezionate\n"
+"vengano controllate per accertare la presenza di eventuali blocchi\n"
+"rovinati."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:376
+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"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
+"Please be patient."
+msgstr ""
+"Il vostro sistema operativo Mandrake Linux � in corso d'installazione. In\n"
+"base al numero di pacchetti che devono essere installati e alla velocit�\n"
+"del vostro computer, questa operazione potrebbe durare pochi minuti o\n"
+"richiedere un tempo molto lungo.\n"
+"\n"
+"Abbiate pazienza, per favore."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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 ""
+"Prima di proseguire dovreste leggere con attenzione le condizioni d'uso;\n"
+"queste riguardano l'intera distribuzione Mandrake Linux, e se non siete\n"
+"d'accordo con qualche punto della licenza cliccate sul pulsante\n"
+"\"Rifiuta\": la procedura di installazione sar� immediatamente interrotta.\n"
+"Per proseguire con l'installazione, invece, cliccate sul pulsante\n"
+"\"Accetta\"."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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 ""
+"Ora � il momento di scegliere il livello di sicurezza desiderato per il\n"
+"vostro sistema. Come regola generale, quanto pi� esposta � la macchina e\n"
+"quanto pi� sono importanti i dati che contiene, tanto pi� alto dovrebbe\n"
+"essere il livello di sicurezza. Tenete presente, tuttavia, che un livello\n"
+"di sicurezza molto alto in genere viene ottenuto a spese della facilit�\n"
+"d'uso. Consultate il capitolo su msec nel ''Manuale di riferimento'' per\n"
+"avere ulteriori informazioni in merito al significato di tali livelli.\n"
+"\n"
+"Se non sapete cosa scegliere, mantenete l'opzione predefinita."
+
+#: ../../help.pm_.c:401
+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"
-"   * 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 ""
 "A questo punto, devi scegliere quale(i) partizione(i) usare per installare\n"
-"il tuo nuovo sistema Linux-Mandrake. Se hai gi� definito delle partizioni\n"
+"il tuo nuovo sistema Mandrake Linux. Se hai gi� definito delle partizioni\n"
 "(per una precedente installazione di GNU/Linux o con un'altra utilit� di\n"
 "partizionamento), puoi usare le partizioni esistenti. In altri casi, devono\n"
 "essere definite alcune partizioni sul disco rigido.\n"
@@ -2459,170 +3064,47 @@ msgstr ""
 "           \n"
 "Se stai installando Linux su una macchina PPC, � opportuno creare una "
 "piccola partizione 'bootstrap' HFS di almeno 1 Mb che verr� usata\n"
-"dal bootloader yaboot. Se decidete di farla pi� grande, diciamo 50 Mb, "
+"dal bootloader yaboot. Se decidi di farla pi� grande, diciamo 50 Mb, "
 "potrebbe rappresentare un utile magazzino dove stivare \n"
 "un kernel di riserva e un'immagine ramdisk per situazioni di emergenza."
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:460
 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"
+"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\" 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 ""
-"Qui sopra sono elencate le partizioni Linux esistenti individuate sul tuo\n"
-"disco rigido. Puoi tenere le scelte fatte dal wizard, sono buone per un\n"
-"uso comune. Se cambi queste scelte, devi definire almeno una partizione\n"
-"root (\"/\"). Non scegliere una partizione troppo piccola on non potrai\n"
-"installare abbastanza software. Se vuoi salvare i tuoi dati su una\n"
-"partizione separata, hai bisogno anche di una \"/home\" (possibile solo\n"
-"se hai pi� di una partizione Linux disponibile).\n"
-"\n"
-"\n"
-"Per informazione, ogni partizione � elencata come segue: \"Nome\", \"Capacit�"
-"\".\n"
-"\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"\"Nome\" � codificato come segue: \"tipo hard disk\", \"numero hard disk\",\n"
-"\"numero partizione\" (per esempio, \"hda1\").\n"
-"\n"
-"\n"
-"\"Tipo hard disk\" � \"hd\" se il tuo disco fisso � di tipo IDE e \"sd\" se\n"
-"� uno SCSI.\n"
-"\n"
-"\n"
-"\"Numero hard disk\" � sempre una lettera dopo \"hd\" o \"sd\". Con dischi\n"
-"fissi IDE:\n"
-"\n"
-"   * \"a\" significa \"disco fisso master sul controller IDE primario\",\n"
-"\n"
-"   * \"b\" significa \"disco fisso slave sul controller IDE primario\",\n"
-"\n"
-"   * \"c\" significa \"disco fisso master sul controller IDE secondario\",\n"
-"\n"
-"   * \"d\" significa \"disco fisso slave sul controller IDE secondario\",\n"
-"\n"
-"\n"
-"Con dischi fissi SCSI, una \"a\" significa \"disco fisso primario\", una \"b"
-"\"\n"
-"significa \"disco fisso secondario\", 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 ""
-"Scegli il disco rigido che vuoi cancellare per installare la tua \n"
-"nuova partizione Linux-Mandrake. Attento, tutti i dati presenti su\n"
-"di esso verranno persi e non saranno recuperabili.\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 ""
-"Clicca su \"OK\" se vuoi cancellare tutti i dati e le partizioni\n"
-"presenti su questo disco fisso. Fai attenzione, dopo aver premuto \"OK\",\n"
-"non potrai recuperare alcun dato o partizione presenti su questo disco\n"
-"rigido, inclusi eventuali dati di Windows.\n"
-"\n"
-"\n"
-"Clicca su \"Cancella\" per annullare questa operazione senza perdere alcun\n"
-"dato o partizione presenti su questo disco rigido."
-
-#: ../../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"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\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.\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 ""
 "Sul tuo disco rigido � stata trovata pi� di una partizione Microsoft "
 "Windows.\n"
 "Per favore, scegli quella che vuoi ridimensionare per installare il tuo "
 "nuovo\n"
-"sistema operativo Linux-Mandrake.\n"
+"sistema operativo Mandrake Linux.\n"
 "\n"
 "Per tua informazione, ogni partizione � elencata come segue: \"Nome Linux"
 "\", \n"
@@ -2654,932 +3136,587 @@ msgstr ""
 "tuo disco rigido sotto Windows (il primo \n"
 "disco o partizione � chiamato \"C:\")."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr ""
 "Per favore, abbi pazienza. Questa operazione pu� durare parecchi minuti"
 
-#: ../../help.pm_.c:309
-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"
-"\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
-msgstr ""
-"Qualsiasi partizione appena definita deve essere formattata\n"
-"prima di essere usata (formattare significa creare un filesystem).\n"
-"\n"
-"\n"
-"A questo punto, potresti voler riformattare alcune partizioni gi�\n"
-"esistenti per cancellare i dati che contengono. Se desideri farlo, per \n"
-"favore scegli le partizioni che vuoi formattare.\n"
-"\n"
-"\n"
-"Per favore nota che non � necessario riformattare partizioni pre-esistenti.\n"
-"Devi riformattare le partizioni che contengono il sistema operativo (come \n"
-"\"/\", \"/usr\" o \"/var\"), ma puoi non riformattare partizioni che "
-"contengono\n"
-"dati che deisderi tenere (tipicamente /home).\n"
-"\n"
-"\n"
-"Per favore fai attenzione nella scelta delle partizioni, con la "
-"formattazione\n"
-"tutti i dati saranno cancellati e non potrai recuperarli.\n"
-"\n"
-"\n"
-"Clicca su \"OK\" quando sei pronto per formattare le partizioni.\n"
-"\n"
-"\n"
-"Clicca su \"Annulla\" se vuoi scegliere altre partizioni per installare il "
-"tuo\n"
-"nuovo sistema operativo 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 ""
-"Ora puoi scegliere il gruppo di pacchetti che vuoi installare o aggiornare.\n"
-"\n"
-"Quindi DrakX controller� se hai abbastanza spazio per installarli tutti. "
-"In \n"
-"caso negativo, ti avvertir�. Se vuoi continuare lo stesso, proceder� alla\n"
-"installazione dei gruppi selezionati, ma tralascer� alcuni pacchetti di "
-"minore\n"
-"interesse. Alla fine della lista puoi scegliere l'opzione\n"
-"\"Selezione individuale pacchetti\"; in questo caso dovrai sfogliare una "
-"lista\n"
-"di pi� di 1000 pacchetti..."
-
-#: ../../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 ""
-"Puoi ora scegliere individualmente tutti i pacchetti\n"
-"che desideri installare.\n"
-"\n"
-"\n"
-"Puoi espandere o raggruppare la struttura cliccando sulle opzioni "
-"nell'angolo\n"
-"a sinistra della finestra dei pacchetti.\n"
-"\n"
-"\n"
-"Se preferisci vedere i pacchetti ordinati alfabeticamente, clicca sulla\n"
-"icona \"Cambia ordinamento semplice o a gruppi\".\n"
-"\n"
-"Se non vuoi essere avvertito per le dipendenze, clicca su \"Dipendenze\n"
-"in automatico\". Se lo fai, nota che deselezionare un pacchetto potrebbe\n"
-"silenziosamente deselezionare alcuni altri pacchetti che da esso dipendono."
-
-#: ../../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 ""
-"Se hai tutti i CD elencati nella lista qui sopra, clicca Ok.\n"
-"Se non hai nessuno di quei CD, clicca Cancel.\n"
-"Se mancano solo alcuni CDs, deselezionali, e clicca 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"
-"\n"
-"\n"
-"Please be patient."
-msgstr ""
-"Il tuo nuovo sistema operativo Linux-Mandrake � in fase\n"
-"di installazione. Questa operazione dovrebbe richiedere alcuni minuti "
-"(dipende\n"
-"dalla dimensione che hai scelto di installare e dalla velocit� del tuo "
-"computer).\n"
-"\n"
-"\n"
-"Per favore pazienta."
-
-#: ../../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 ""
-"Ora puoi provare il tuo mouse. Usa i pulsanti e la rotella per\n"
-"verificare che i settaggi siano corretti. Se non lo sono, puoi cliccare su\n"
-"\"Annulla\" per scegliere un altro driver."
-
-#: ../../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."
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:494
+msgid ""
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). 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 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"
+" * 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 ""
+"A questo punto DrakX deve sapere se intendete effettuare un'installazione\n"
+"in modalit� predefinita (\"Raccomandata\") o se preferite avere un maggior\n"
+"controllo su di essa (\"Esperto\"). Inoltre potete scegliere se effettuare\n"
+"una nuova installazione o un aggiornamento di un sistema Mandrake Linux\n"
+"esistente.\n"
+"\n"
+"Scegliete una delle seguenti modalit� di installazione, in base alla vostra\n"
+"conoscenza di GNU/Linux:\n"
+"\n"
+" * Raccomandata: se non avete mai installato il sistema operativo GNU/"
+"Linux,\n"
+"scegliete questa; l'installazione sar� molto semplice e vi verranno poste\n"
+"solo poche domande;\n"
+"\n"
+" * Esperto: se avete abbastanza familiarit� con GNU/Linux potete scegliere\n"
+"questa modalit�, che vi permetter� di effettuare un'installazione altamente\n"
+"personalizzata. Rispondere ad alcune delle domande che vi verranno poste\n"
+"potrebbe essere difficile se non avete una buona conoscenza di GNU/Linux,\n"
+"pertanto non fate questa scelta se non sapete bene quello che state\n"
+"facendo.\n"
+"\n"
+"Scegliete quindi \"Installa\" se non sono presenti precedenti versioni di\n"
+"Mandrake Linux, o se desiderate averne pi� versioni installate\n"
+"contemporaneamente.\n"
+"\n"
+"Scegliete invece \"Aggiorna\" se desiderate aggiornare o ripristinare un\n"
+"sistema su cui � gi� presente una versione di Mandrake Linux."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:521
+msgid ""
+"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 ""
+"Normalmente DrakX provvede a individuare automaticamente la tastiera\n"
+"corretta (in base alla lingua che avete scelto) e voi non vedrete nemmeno\n"
+"questo passo. Tuttavia, potreste avere una tastiera che non corrisponde\n"
+"esattamente alla vostra lingua: se siete un francese che parla italiano, ad\n"
+"esempio, potreste comunque preferire una tastiera francese. Oppure, se\n"
+"parlate italiano ma vivete nel Qu�bec, potreste trovarvi nella stessa\n"
+"situazione. In entrambi i casi, dovrete tornare a questa fase\n"
+"dell'installazione e selezionare una tastiera appropriata dalla lista.\n"
+"\n"
+"Cliccate sul pulsante \"Avanzato\" per vedere una lista completa delle\n"
+"tastiere supportate."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:534
+msgid ""
+"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 ""
+"Scegliete la lingua che intendete usare per l'installazione e l'uso del\n"
+"sistema.\n"
+"\n"
+"Cliccando sul pulsante \"Avanzato\" potrete scegliere altre lingue da\n"
+"installare sul vostro computer. La selezione di altre lingue comporta\n"
+"l'installazione dei file relativi alla documentazione e alle applicazioni\n"
+"per ciascuna di esse. Se il vostro computer dovr� essere usato, ad esempio,\n"
+"anche da persone di madre lingua spagnola, potete scegliere l'italiano come\n"
+"lingua principale nella struttura ad albero e, nella sezione \"Avanzato\",\n"
+"apporre un segno di spunta sul pulsante grigio corrispondente a\n"
+"\"Spanish|Spain\".\n"
+"\n"
+"� possibile installare i file per pi� lingue allo stesso tempo. Dopo aver\n"
+"scelto quelle che preferite cliccate sul pulsante \"Ok\" per continuare."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:547
+msgid ""
+"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"
+"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 ""
+"Come opzione predefinita, DrakX vede il vostro mouse come un mouse a due\n"
+"tasti e lo imposta in modo da emulare il terzo tasto. DrakX, inoltre,\n"
+"riconosce automaticamente se si tratta di un mouse PS/2, seriale o USB.\n"
+"\n"
+"Se volete specificare un diverso tipo di mouse, scegliete il vostro modello\n"
+"dall'elenco mostrato.\n"
+"\n"
+"Se scegliete un mouse diverso dal tipo predefinito, vi verr� mostrata una\n"
+"finestra dove potrete provarlo. Provate sia i pulsanti che l'eventuale\n"
+"rotellina per controllare che la configurazione sia corretta. Se il mouse\n"
+"non funziona correttamente premete la barra spaziatrice o il tasto [Invio]\n"
+"per chiudere la finestra ed effettuare una nuova scelta."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+#: ../../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 ""
 "Per favore scegli la porta corretta. La porta COM1 di MS Windows,\n"
 "ad esempio, � chiamata ttyS0 sotto 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 ""
-"Se desideri connettere il tuo computer a Internet o\n"
-"a una rete locale, per favore scegli l'opzione corretta. Per favore accendi\n"
-"il tuo dispositivo prima di scegliere l'opzione corretta per permettere\n"
-"a DrakX di individuarlo automaticamente.\n"
-"\n"
-"\n"
-"Se non hai alcuna connessione ad Internet o a una rete locale, scegli\n"
-"\"Disabilita rete\".\n"
-"\n"
-"\n"
-"Se desideri configurare la rete pi� tardi dopo l'installazione, o se hai\n"
-"finito di configurare la tua connessione di rete, scegli \"Fatto\"."
-
-#: ../../help.pm_.c:399
-msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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 ""
-"Nessun modem individuato. Per favore seleziona la porta seriale a cui � "
-"connesso.\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"
-"Per tua informazione, la prima porta seriale (chiamata \"COM1\" sotto MS\n"
-"Windows) � chiamata \"ttyS0\" sotto 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 ""
-"Ora puoi inserire le opzioni di chiamata. Se non le sai o\n"
-"non sei sicuro di cosa inserire, le informazioni esatte possono essere\n"
-"ottenute dal tuo Internet Service Provider. Se non immetti l'informazione\n"
-"DNS (nome server) qui, sar� ottenuta dal tuo Internet Service Provider\n"
-"in fase di connessione."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Se il tuo modem � esterno, per favore accendilo e lascia che DrakX lo "
-"riconosca in automatico."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Per favore accendi il tuo modem e scegli quello corretto."
-
-#: ../../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 ""
-"Se non sei sicuro che le informazioni qui sopra\n"
-"siano corrette, o se non sai o sei sicuro di cosa immettere, le "
-"informazioni\n"
-"corrette possono essere ottenute dal tuo Internet Service Provider. Se non\n"
-"inserisci l'informazione DNS (server dei nomi) qui, verr� ottenuta dal tuo \n"
-"Internet Service Provider in fase di connessione."
-
-#: ../../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 ""
-"Adesso puoi inserire il nome del tuo host se necessario. Se non sei sicuro "
-"di cosa\n"
-"inserire, le informazioni corrette possono essere reperite presso il tuo ISP "
-"(Internet Service Provider)."
-
-#: ../../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 ""
-"Adesso puoi configurare il dispositivo di rete.\n"
-"\n"
-"   * Indirizzo IP: se non lo conosci o non sei sicuro, chiedi al tuo "
-"amministratore di rete.\n"
-"     Se pi� avanti scegli l'opzione \"IP automatico\", non dovresti inserire "
-"un indirizzo IP qui.\n"
-"\n"
-"   * Netmask: \"255.255.255.0\" � generalmente una buona scelta. Se non sei\n"
-"sicuro, chiedi all'amministratore di rete.\n"
-"\n"
-"\n"
-"   * IP automatico: se la tua rete usa i protocolli BOOTP o DHCP, scegli \n"
-"questa opzione. Se selezionata, nessun valore � necessario in \"indirizzo IP"
-"\".\n"
-"Se non sei sicuro, o non sai se � necessario attivare questa opzione, chiedi "
-"al tuo amministratore di rete."
-
-#: ../../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 ""
-"Adesso puoi inserire il nome del tuo host se necessario. Se non\n"
-"lo sai o non sei sicuro, chiedi al tuo amministratore di rete."
-
-#: ../../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 ""
-"Adesso puoi inserire il nome del tuo host se necessario. Se non\n"
-"lo sai o non sei sicuro, lascia in bianco."
-
-#: ../../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 ""
-"Puoi ora inserire le opzioni di connessione. Se non sei sicuro di cosa\n"
-"inserire, le informazioni corrette possono essere reperite presso il tuo 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 ""
-"Se userai dei proxy, per favore configurali ora. Se non sai se userai\n"
-"dei proxy, chiedi al tuo amministratore di rete o all'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 ""
-"Puoi installare i pacchetti di crittografia, se la tua connessione Internet\n"
-"� stata configurata correttamente. Per prima cosa scegli un mirror da cui "
-"scaricare\n"
-"i pacchetti, e poi scegli i pacchetti da installare.\n"
-"\n"
-"\n"
-"Nota che devi scegliere mirror e pacchetti di crittografia in conformit� "
-"con\n"
-"quanto previsto dalla tua legislazione."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Puoi ora scegliere il tuo fuso orario in base a dove vivi."
-
-#: ../../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 gestisce il tempo in GMT, o \"Greenwich Mean Time\", e lo traduce\n"
-"in tempo locale secondo la fascia oraria da te scelta.\n"
-"Se su questo computer � installato MS Windows, scegli \"No\"."
-
-#: ../../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 ""
-"Puoi ora scegliere quali servizi devono essere avviati al momento del boot.\n"
-"\n"
-"\n"
-"Quando il tuo mouse passa sopra un oggetto, apparir� un piccolo testo di "
-"aiuto\n"
-"che descrive la funzione del servizio.\n"
-"\n"
-"\n"
-"Presta particolare attenzione a questa fase se intendi usare la tua "
-"macchina\n"
-"come server: probabilmente non vorrai avviare alcun servizio di cui non\n"
-"hai bisogno. Ricorda che numerosi servizi possono essere pericolosi\n"
-"se attivati su un server. Come regola generale, seleziona solo i servizi di "
-"cui hai davvero bisogno."
-
-#: ../../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 ""
-"Puoi configurare una stampante locale (connessa al tuo computer) o una\n"
-"remota (accessibile via una rete 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"
-"\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 ""
-"Se desideri essere in grado di stampare, per favore scegli uno dei due\n"
-"sistemi di stampa, CUPS o LPR.\n"
-"\n"
-"\n"
-"CUPS � un sistema di stampa per sistemi Unix nuovo, potente e flessibile "
-"(CUPS\n"
-"significa \"Common Unix Printing System\"). � il sistema predefinito in\n"
-"Linux-Mandrake.\n"
-"\n"
-"\n"
-"LPR � il vecchio sistema di stampa usato in precedenti distribuzioni Linux-"
-"Mandrake.\n"
-"\n"
-"\n"
-"Se non hai una stampante, clicca su \"Nessuno\"."
-
-#: ../../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 pu� gestire molti tipi di stampanti. Ognuno di essi richiede un\n"
-"differente settaggio.\n"
-"\n"
 "\n"
-"Se la tua stampante � fisicamente connessa al computer, scegli \n"
-"\"Stampante locale\".\n"
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
+msgstr ""
+"Questo � il punto pi� critico per la sicurezza del vostro sistema\n"
+"GNU/Linux: state per decidere la password di \"root\". \"root\" �\n"
+"l'amministratore del sistema, ed � l'unico utente autorizzato a compiere\n"
+"aggiornamenti, aggiungere altri utenti, cambiare la configurazione globale\n"
+"del sistema, etc. In breve, pu� fare tutto ci� che vuole! Questo � il\n"
+"motivo per cui dovete scegliere una password che sia difficile da\n"
+"indovinare: DrakX vi dir� se � troppo facile. Potete anche scegliere di non\n"
+"digitare una password, ma noi vi consigliamo caldamente di farlo, almeno\n"
+"per un motivo: non pensate che, avviando il sistema con GNU/Linux, gli\n"
+"altri sistemi operativi che convivono con esso sulla stessa macchina siano\n"
+"al sicuro da errori; al contrario: \"root\" pu� scavalcare ogni limitazione\n"
+"e (magari involontariamente) cancellare tutti i dati presenti sulle\n"
+"partizioni accedendo in maniera scorretta a queste ultime! Quindi � molto\n"
+"importante che sia difficile per gli utenti normali diventare \"root\".\n"
 "\n"
+"La password ideale � costituita da un insieme di caratteri alfanumerici\n"
+"lungo almeno 8 caratteri. Non scrivete mai su qualche appunto la password\n"
+"di \"root\", renderebbe troppo facile l'accesso al sistema da parte di\n"
+"estranei.\n"
 "\n"
-"Se vuoi accedere a una stampante che si trova su una macchina remota "
-"Microsoft\n"
-"Windows (o una macchina Unix che usa il protocollo SMB), scegli\n"
-"\"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 ""
-"Per favore, accendi la tua stampante prima di continuare per permettere a "
-"DrakX\n"
-"di identificarla.\n"
-"\n"
-"Qui devi inserire alcune informazioni.\n"
-"\n"
-"\n"
-"   * Nome stampante: lo spooler di stampa usa \"lp\" come nome predefinito. "
-"Perci� devi avere una stampante chiamata \"lp\".\n"
-"     Se hai solo una stampante, puoi assegnarle diversi nomi. Devi solo "
-"separarli con un carattere pipe\n"
-"     (un \"|\"). Cos�, se preferisci un nome pi� significativo, devi "
-"metterlo per primo, es: \"Mia Stampante|lp\".\n"
-"     La stampante che ha \"lp\" nel(i) nome(i) sar� quella predefinita.\n"
-"\n"
-"\n"
-"   * Descrizione: � opzionale, ma pu� essere utile se hai diverse stampanti "
-"connesse al tuo computer o se permetti ad\n"
-"     altri computers di accedere a questa stampante.\n"
-"\n"
-"\n"
-"   * Posizione: se vuoi inserire qualche informazione su dove\n"
-"si trova la tua stampante, mettila qui (sei libero di scrivere ci�\n"
-"     che vuoi, per esempio \"2ndo piano\").\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 ""
-"Qui devi inserire alcune informazioni.\n"
-"\n"
-"\n"
-"   * Nome della coda: lo spooler di stampa usa \"lp\" come nome predefinito. "
-"Perci� devi avere una stampante chiamata \"lp\".\n"
-"     Se hai solo una stampante, puoi assegnarle diversi nomi. Devi solo "
-"separarli con un carattere pipe\n"
-"     (un \"|\"). Cos�, se preferisci un nome pi� significativo, devi "
-"metterlo per primo, es: \"Mia Stampante|lp\".\n"
-"\n"
-"  \n"
-"   * Directory di spool: � la directory in cui sono immagazzinati i lavori "
-"di stampa. Mantieni le\n"
-"impostazioni predefinite se non sai cosa usare\n"
-"\n"
-"\n"
-"   * Connessione Stampante: se la tua stampante � fisicamente connessa al "
-"tuo computer, scegli \"Stampante locale\".\n"
-"     Se vuoi accedere ad una stampante che si trova su una macchina Unix "
-"remota, scegli \"Stampante lpd remota\".\n"
-"\n"
+"Prestate attenzione, tuttavia, a non scegliere una password troppo lunga o\n"
+"complicata, perch� dovete essere in grado di ricordarla senza troppo\n"
+"sforzo.\n"
 "\n"
-"    Se vuoi accedere a una stampante che si trova su una macchina Microsoft "
-"Windows remota (o su una Unix che\n"
-"    usa il protocollo SMB), scegli \"SMB/Windows95/98/NT\".\n"
+"La password non verr� mostrata mentre la digitate. Per questo motivo �\n"
+"necessario che venga inserita due volte, per ridurre il rischio di un\n"
+"errore di battitura. Se per caso commettete lo stesso errore due volte,\n"
+"questa password \"scorretta\" sar� quella che verr� richiesta la prima\n"
+"volta che vi connetterete al sistema.\n"
 "\n"
+"In modalit� Esperto vi verr� chiesto se il vostro computer � connesso a un\n"
+"server di autenticazione, secondo il protocollo NIS o LDAP.\n"
 "\n"
-"    Se vuoi accedere a una stampante che fa parte di una rete NetWare, "
-"scegli \"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"
+"Se la vostra rete si basa sul protocollo LDAP (o NIS) per l'autenticazione,\n"
+"selezionate il pulsante \"LDAP\" (o \"NIS\") per effettuare\n"
+"l'autenticazione. Se non siete sicuri, chiedete al vostro amministratore di\n"
+"rete.\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 ""
-"La tua stampante non � stata individuata. Per favore, inserisci il nome del\n"
-"dispositivo al quale � connessa.\n"
-"\n"
-"\n"
-"Per tua informazione, la maggior parte delle stampanti � connessa alla prima "
-"porta\n"
-"parallela. � chiamata \"/dev/lp0\" sotto GNU/Linux e \"LPT1\" sotto "
-"Microsoft\n"
-"Windows."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Ora puoi scegliere la tua stampante dalla lista qui sopra."
+"Se il vostro computer non � connesso a una rete soggetta ad autenticazione,\n"
+"scegliete \"File locali\"."
 
-#: ../../help.pm_.c:584
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../help.pm_.c:600
 msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\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"
-"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 ""
-"Per favore seleziona le opzioni corrette per la tua stampante.\n"
-"Se non sai cosa scegliere, consulta la sua documentazione.\n"
-"\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
-"Potrai provare la tua configurazione nella prossima fase e sarai in grado\n"
-"di modificarla se non funziona come vuoi."
-
-#: ../../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"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
+" * \"Boot loader to use\": you have three choices:\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 with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\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 ""
-"Ora puoi inserire la password di root per il tuo sistema Linux-Mandrake.\n"
-"La password deve essere digitata due volte per verificare che\n"
-"entrambi gli inserimenti siano uguali.\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"
-"Root � l'amministratore del sistema, ed � l'unico utente\n"
-"abilitato alla modifica della configurazione del sistema. Perci�, scegli\n"
-"la password attentamente! L'uso non autorizzato dell'account root pu�\n"
-"essere estremamente pericoloso per l'integrit� del sistema, i dati che\n"
-"contiene, e altri sistemi cui � connesso. La password dovrebbe essere un\n"
-"insieme di caratteri alfanumerici, e lunga almeno 8 caratteri. Non\n"
-"dovrebbe *mai* essere scritta su carta. Non creare una password troppo "
-"lunga\n"
-"o complicata, ad ogni modo: devi essere in grado di ricordarla senza troppo\n"
-"sforzo."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Per avere un sistema pi� sicuro, dovresti scegliere \"Usa shadow file\" e\n"
-"\"Usa passwords 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 ""
-"Se la tua rete usa NIS, scegli \"Usa NIS\". Se non sai, chiedi al tuo\n"
-"amministratore di rete."
-
-#: ../../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"
+" * \"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"
-"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"
+"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"
-"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 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 ""
-"Ora puoi creare uno o pi� account per utenti \"normali\", come controparte\n"
-"dell'account dell'utente \"privilegiato\", root. Puoi creare uno o pi�\n"
-"account per ogni persona cui vuoi permettere di usare il computer.\n"
-"Nota che ogni utente avr� le sue proprie preferenze (ambiente\n"
-"grafico, impostazioni dei programmi, etc.) e la sua \"directory home\" in\n"
-"cui sono archiviate queste preferenze.\n"
+"LILO e GRUB sono due ''bootloader'' di GNU/Linux. Un bootloader � un\n"
+"programma per l'avvio di uno o pi� sistemi operativi. Questa fase, in\n"
+"genere, � del tutto automatica; DrakX, infatti, analizza il settore di boot\n"
+"del disco, e si comporta in base a quello che vi trova:\n"
 "\n"
+" * se trova un settore di boot di Windows, lo rimpiazza con un settore di\n"
+"boot di GRUB o LILO, in modo da permettervi di lanciare GNU/Linux o\n"
+"Windows;\n"
 "\n"
-"Prima di tutto, crea un account per te stesso! Anche se sarai l'unico "
-"utente\n"
-"della macchina, NON dovresti connetterti come root per uso giornaliero del "
-"sistema: � un\n"
-"alto rischio per la sicurezza. Rendere il sistema inutilizzabile � molto "
-"spesso questione di un solo tasto sbagliato.\n"
+" * se trova un settore di boot di GRUB o LILO, lo sostituisce con uno "
+"nuovo.\n"
 "\n"
+"In caso di dubbio, DrakX mostrer� una finestra di dialogo con varie\n"
+"opzioni:\n"
 "\n"
-"Perci� dovresti connetterti al sistema usando l'accesso utente che avrai\n"
-"creato qui, e fare il login come root solo per scopi di amministrazione\n"
-"e manutenzione."
-
-#: ../../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 ""
-"� fortemente consigliato creare un disco di avvio. Se non puoi\n"
-"avviare il tuo computer, � l'unico modo per recuperarlo senza doverlo\n"
-"reinstallare."
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
+" * \"Bootloader da usare\": avete tre scelte a disposizione:\n"
 "\n"
+"    * \"LILO con menu grafico\": se preferite LILO con la sua interfaccia\n"
+"grafica;\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"Devi indicare dove vuoi\n"
-"archiviare le informazioni richieste per il boot di GNU/Linux.\n"
+"    * \"GRUB\": se preferite GRUB (menu in modo testo);\n"
 "\n"
-"A meno che tu non sappia esattamente cosa stai facendo, scegli \n"
-"Primo settore del drive (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 ""
-"A meno che tu non sia sicuro del contrario, la scelta usuale � \"/dev/hda\"\n"
-"(il disco IDE principale sul canale primario) o \"/dev/sda\" (il primo disco "
-"SCSI)."
-
-#: ../../help.pm_.c:653
+"    * \"LILO con menu in modo testo\": se preferite LILO nella sua versione "
+"con\n"
+"menu in modo testo.\n"
+"\n"
+" * \"Dispositivo di boot\": nella maggior parte dei casi non sar� "
+"necessario\n"
+"cambiare le impostazioni predefinite (\"/dev/hda\"), ma, se lo preferite,\n"
+"il bootloader pu� essere installato sul secondo disco rigido\n"
+"(\"/dev/hdb\"), o persino su un floppy (\"/dev/fd0\");\n"
+"\n"
+" * \"Ritardo prima di avviare con l'immagine predefinita\": � il tempo\n"
+"lasciato all'utente per scegliere una voce diversa da quella predefinita\n"
+"nel menu del bootloader.\n"
+"\n"
+"!! Prestate particolare attenzione al fatto che, se scegliete di non\n"
+"installare un bootloader (scegliendo \"Annulla\" nella finestra di cui\n"
+"sopra), dovete essere sicuri di poter avviare il vostro sistema Mandrake\n"
+"Linux in altro modo! Accertatevi anche di sapere quello che fate se\n"
+"modificate qualcuna delle opzioni. !!\n"
+"\n"
+"Cliccando sul pulsante \"Avanzato\" di questa finestra avrete la\n"
+"possibilit� di scegliere tra molte opzioni avanzate, riservate agli utenti\n"
+"esperti.\n"
+"\n"
+"Mandrake Linux provveder� a installare il proprio bootloader in modo da\n"
+"permettervi di avviare il sistema con GNU/Linux oppure con qualsiasi altro\n"
+"sistema operativo voi abbiate installato.\n"
+"\n"
+"Se sulla vostra macchina � gi� installato un altro sistema operativo,\n"
+"quest'ultimo verr� automaticamente aggiunto al menu di avvio. Potete anche\n"
+"scegliere di configurare con precisione le opzioni esistenti: con un doppio\n"
+"click su una delle voci potrete modificarne i parametri o rimuoverla;\n"
+"\"Aggiungi\" crea una nuova voce, mentre cliccando su \"Fatto\" passerete\n"
+"alla fase di installazione successiva."
+
+#: ../../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 (il LInux LOader) e Grub sono bootloader: sono capaci di caricare\n"
-"indifferentemente Linux o altri sistemi operativi presenti sul tuo "
+"SILO � un bootloader per SPARC: � in grado di caricare\n"
+"indifferentemente GNU/Linux o altri sistemi operativi presenti sul tuo "
 "computer.\n"
 "Normalmente, questi sistemi operativi sono correttamente rilevati e\n"
-"installati. Se ci� non avviene, puoi aggiungere una voce a mano in questo "
+"installati. Se non avviene, puoi aggiungere una voce a mano in questo "
 "schermo.\n"
 "Stai attento a scegliere i parametri corretti.\n"
 "\n"
 "\n"
 "Potresti anche non voler dare l'accesso a questi sistemi operativi a "
 "chiunque,\n"
-"nel qual caso puoi cancellare la voci corrispondenti. ma se lo fai avrai\n"
+"nel qual caso puoi cancellare la voci corrispondenti. ma in questo caso, "
+"avrai\n"
 "bisogno di un boot disk per caricarli!"
 
-#: ../../help.pm_.c:665
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+#: ../../help.pm_.c:658
 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"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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."
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
 msgstr ""
-"Le opzioni principali di LILO e grub sono:\n"
-"  - Boot device: specifica il nome del dispositivo (es. una partizione\n"
-"del disco rigido) che contiene il settore di boot. A meno che tu non sia "
-"sicuro di un'impostazione diversa, scegli \"/dev/hda\".\n"
+"Devi indicare dove vuoi\n"
+"archiviare le informazioni richieste per il boot di GNU/Linux.\n"
 "\n"
+"A meno che tu non sappia esattamente cosa stai facendo, scegli \n"
+"Primo settore del drive (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"
-"  - Ritardo prima di caricare l'immagine di default: specifica il tempo (in\n"
-"decimi di secondo) che il boot loader deve attendere prima di caricare la \n"
-"prima immagine.\n"
-"� utile su sistemi che effettuano subito il boot dal disco rigido dopo "
-"avere\n"
-"abilitato la tastiera. Il boot loader non aspetta se \"ritardo\" � omesso\n"
-"o se � fissato a zero.\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 ""
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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"
+"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 ""
+"Ora DrakX proceder� con il rilevamento di tutti i dischi rigidi e altri\n"
+"dispositivi IDE presenti sul vostro computer, e cercher� anche di stabilire\n"
+"se sul vostro sistema sono presenti una o pi� schede SCSI di tipo PCI. Se\n"
+"verr� individuato un dispositivo di questo tipo, DrakX installer�\n"
+"automaticamente il relativo driver.\n"
+"\n"
+"Dato che il riconoscimento automatico in alcuni casi potrebbe non riuscire\n"
+"a individuare una particolare periferica, vi verr� comunque chiesto se\n"
+"avete una scheda SCSI PCI diversa da quelle eventualmente identificate\n"
+"oppure no. Scegliete \"S�\" se siete sicuri che nel vostro computer �\n"
+"presente un'altra scheda SCSI: potrete scegliere la vostra scheda da una\n"
+"lista. Scegliete \"No\" se non disponete di nessun tipo di hardware SCSI, o\n"
+"se siete soddisfatti del riconoscimento automatico. Se non siete sicuri,\n"
+"potete anche controllare la lista dell'hardware rilevato nella vostra\n"
+"macchina selezionando \"Vedi informazioni hardware\" e cliccando su \"Ok\".\n"
+"Controllate l'elenco dell'hardware individuato e poi cliccate sul pulsante\n"
+"\"Ok\" per ritornare alla domanda relativa alla scheda SCSI.\n"
+"\n"
+"Se sarete costretti a specificare manualmente il tipo di scheda in vostro\n"
+"possesso, DrakX vi chieder� se intendete indicare delle opzioni da usare\n"
+"con essa. Vi consigliamo di permettere a DrakX di esaminare l'hardware per\n"
+"stabilire le particolari opzioni della scheda che dovranno essere usate\n"
+"all'inizializzazione; questo metodo in genere permette di ottenere buoni\n"
+"risultati.\n"
+"\n"
+"Se DrakX non riesce a stabilire quali sono le opzioni da passare alla\n"
+"scheda, dovrete specificarle manualmente. Se non riuscite a trovare le\n"
+"informazioni necessarie nella documentazione dell'hardware o sul sito web\n"
+"del produttore (se disponete di un accesso a Internet), consultate il\n"
+"capitolo 3, al paragrafo \"Ricerca di informazioni sul vostro hardware\",\n"
+"per qualche suggerimento su come ottenerle da Microsoft Windows (se avete\n"
+"utilizzato la stessa scheda con Windows sul vostro stesso sistema)."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+#: ../../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"
+"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"
+" * 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"
+" * 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"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
-"  - Modo Video: specifica il modo testo VGA che dovrebbe essere selezionato\n"
-"al momento del boot. Sono disponibili i valori seguenti: \n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"    * normale: seleziona il normale modo testo 80x25.\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"
-"    * <numero>: usa il modo testo corrispondente.\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"
-"  - Pulisci \"/tmp\" ad ogni boot: se volete cancellare tutti i file e le "
-"directory\n"
-"contenute in \"/tmp\" quando avviate il sistema selezionate questa opzione.\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"
-"  - Precisa RAM se necessario: sfortunatamente non esiste un metodo standard "
-"per\n"
-"interrogare il BIOS riguardo la quantit� di RAM presente. Di conseguenza, "
-"Linux pu�\n"
-"fallire nel tentare di determinare tale quantit�. In tal caso potete\n"
-"specificare qui la cifra corretta. Notate che una differenza di 2 or 4\n"
-"Mb tra memoria individuata e memoria presente nel sistema � normale."
+" * 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:697
+#: ../../help.pm_.c:765
 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 ""
 "Yaboot � un bootloader per hardware NewWorld MacIntosh. � in grado di\n"
 "avviare GNU/Linux, MacOS, o MacOSX, se presenti sul vostro computer.\n"
 "Normalmente gli altri sistemi operativi sono identificati e installati\n"
-"correttamente. Se cos� non fosse potete aggiungere manualmente una voce\n"
+"correttamente. Se cos� non fosse, potete aggiungere manualmente una voce\n"
 "in questa schermata. Accertatevi di scegliere i parametri corretti.\n"
 "\n"
 "\n"
@@ -3602,301 +3739,126 @@ msgstr ""
 "\n"
 "\n"
 "  - Kernel Boot Timeout: questa pausa � simile all'attesa di LILO.  Dopo \n"
-"aver selezionato Linux, avrete a disposizione un'attesa misurata in decimi "
+"aver selezionato Linux, avrai a disposizione un'attesa misurata in decimi "
 "di\n"
 "secondo prima che venga selezionata la descrizione del kernel predefinita.\n"
 "\n"
 "\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\n"
+"  - Enable CD Boot?: selezionando questa opzione potrai scegliere 'C' per CD "
+"al\n"
+"primo avvio del sistema.\n"
 "\n"
 "\n"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
+"  - Enable OF Boot?: selezionando questa opzione potrai scegliere 'N' per "
 "Open\n"
-"Firmware at the first boot prompt.\n"
+"Firmware al primo avvio del sistema.\n"
 "\n"
 "\n"
-"  - Default OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+"  - Default OS: puoi scegliere qual � il SO predefinito da avviare quando "
+"termina \n"
+"la pausa dell'Open Firmware."
 
-#: ../../help.pm_.c:738
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/it/drakx-help.xml
+#: ../../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"
+"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"
-"  \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"
+" * \"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"
-"  - 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"
+" * \"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"
-"  - 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"
+" * \"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 ""
+"Qui sono riportati vari parametri relativi al vostro sistema. In base\n"
+"all'hardware installato, potrebbero essere visualizzate le seguenti voci:\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\": mousecontrollate la configurazione attuale del mouse, e\n"
+"cliccate sul pulsante per cambiarla, se necessario;\n"
 "\n"
+" * \"Tastiera\": tastieracontrollate l'attuale impostazione della tastiera,\n"
+"e cliccate sul pulsante per cambiarla, se necessario;\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"
+" * \"Fuso orario\": fuso orarioDrakX, come opzione predefinita, deduce il\n"
+"vostro fuso orario dalla lingua che avete scelto. Ma anche in questo caso,\n"
+"come per la scelta della tastiera, potreste non trovarvi nella nazione cui\n"
+"corrisponde la lingua che avete scelto; in tal caso sar� necessario\n"
+"cliccare su questo pulsante per poter configurare il fuso orario in base a\n"
+"quello dell'area geografica in cui vivete;\n"
 "\n"
+" * \"Stampante\": cliccando sul pulsante \"Nessuna stampante\" si "
+"richiamer�\n"
+"l'assistente di configurazione della stampante;\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 � un bootloader per SPARC: � in grado di caricare\n"
-"indifferentemente GNU/Linux o altri sistemi operativi presenti sul tuo "
-"computer.\n"
-"Normalmente, questi sistemi operativi sono correttamente rilevati e\n"
-"installati. Se non avviene, puoi aggiungere una voce a mano in questo "
-"schermo.\n"
-"Stai attento a scegliere i parametri corretti.\n"
+" * \"Scheda audio\": se sul vostro sistema � stata individuata una scheda\n"
+"audio, verr� mostrata qui. Al momento dell'installazione non � possibile\n"
+"apportare alcuna modifica;\n"
 "\n"
+" * \"Scheda TV\": se sul vostro sistema � stata individuata una scheda TV,\n"
+"verr� mostrata qui. Al momento dell'installazione non � possibile apportare\n"
+"alcuna modifica;\n"
 "\n"
-"Potresti anche non voler dare l'accesso a questi sistemi operativi a "
-"chiunque,\n"
-"nel qual caso puoi cancellare la voci corrispondenti. ma in questo caso, "
-"avrai\n"
-"bisogno di un boot disk per caricarli!"
+" * \"Scheda ISDN\": se sul vostro sistema � stata individuata una scheda\n"
+"ISDN, verr� mostrata qui. Potete cliccare sul pulsante relativo per\n"
+"cambiarne i parametri."
 
-#: ../../help.pm_.c:805
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+#: ../../help.pm_.c:827
 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 ""
-"Le opzioni principali di SILO sono:\n"
-"  - Installazione bootloader: Indica dove vuoi posizionare le informazioni\n"
-"richieste per avviare GNU/Linux. A meno che tu non sappia esattamente cosa\n"
-"stai facendo, scegli \"Primo settore del drive (MBR)\".\n"
-"\n"
-"\n"
-"  - Ritardo prima di caricare l'immagine di default: Specifica il tempo in\n"
-"decimi di secondo che il boot loader deve attendere prima di caricare la \n"
-"prima immagine.\n"
-"� utile su sistemi che caricano immediatamente dall'hard disk dopo avere\n"
-"abilitato la tastiera. Il boot loader non aspetta se \"ritardo\" � omesso\n"
-"o se � fissato a zero."
+"Scegli il disco rigido che vuoi cancellare per installare la tua \n"
+"nuova partizione Mandrake Linux. Attento, tutti i dati presenti su\n"
+"di esso verranno persi e non saranno recuperabili."
 
-#: ../../help.pm_.c:818
+#: ../../help.pm_.c:832
 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"
+"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"
-"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 ""
-"Adesso � il momento di configurare il sistema X-Windows, che � il cuore\n"
-"della GUI (Interfaccia Grafica Utente) di GNU/Linux. A questo scopo,\n"
-"devi configurare la tua scheda video e il monitor. La maggior parte\n"
-"di queste fasi � automatizzata, per�, perci� il tuo lavoro consister�\n"
-"solo nel verificare cosa � stato fatto e accettare le impostazioni :)\n"
+"Clicca su \"OK\" se vuoi cancellare tutti i dati e le partizioni\n"
+"presenti su questo disco fisso. Fai attenzione, dopo aver premuto \"OK\",\n"
+"non potrai recuperare alcun dato o partizione presenti su questo disco\n"
+"rigido, inclusi eventuali dati di Windows.\n"
 "\n"
-"Quando la configurazione � finita, sar� lanciato X (a meno che\n"
-"tu dica a DrakX di non farlo) cos� che tu possa controllare se le\n"
-"impostazioni sono corrette. Se non vanno bene, puoi tornare indietro e\n"
-"cambiarle tutte le volte che � necessario."
-
-#: ../../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 qualcosa � sbagliato nella configurazione di X, usa queste opzioni per\n"
-"configurare correttamente il Sistema X Window."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Se preferisci usare un login grafico, scegli \"S�\". Altrimenti, scegli\n"
-"\"No\"."
-
-#: ../../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 ""
-"Puoi scegliere un livello di sicurezza per il sistema. Consulta il manuale "
-"per ulteriori\n"
-"  informazioni. Come regola generale, se non sai cosa scegliere mantieni "
-"l'opzione \n"
-"predefinita.\n"
+"Clicca su \"Cancella\" per annullare questa operazione senza perdere alcun\n"
+"dato o partizione presenti su questo disco rigido."
 
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"Il sistema sta per essere riavviato.\n"
-"\n"
-"Dopo il riavvio, il tuo sistema Linux-Mandrake sar� caricato "
-"automaticamente.\n"
-"Se vuoi avviare un altro sistema operativo, per favore leggi le istruzioni\n"
-"aggiuntive."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Scegli la tua lingua"
-
-# there is no room to put "Scegli classe d'installazione"
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Classe d'installazione"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Ricerca del disco fisso"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Configura mouse"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Scegli la tua tastiera"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Sicurezza"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Configura il filesystem"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formatta partizioni"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Pacchetti da installare"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Installa sistema"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Scegli password per root"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Aggiungi un utente"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Configura rete"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Riepilogo"
 
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Configura servizi"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Crea disco di boot"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Installa bootloader"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Configura X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Termina installazione"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3920,20 +3882,20 @@ msgstr ""
 "\n"
 "Vuoi davvero installare questi server?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
-msgstr ""
+msgstr "Non posso usare broadcast senza un dominio NIS"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Inserisci un floppy MS-DOS nel drive %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "Questo floppy non � stato formattato usando MS DOS/Windows"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3941,30 +3903,20 @@ msgstr ""
 "Per usare la selezione di pacchetti che avete salvato, dovete cominciare "
 "l'installazione digitando ``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Errore leggendo il file $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Errore leggendo il file %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 "Per favore prova il mouse"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Per attivare il mouse"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "MUOVI LA RUOTA!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3974,7 +3926,7 @@ msgstr ""
 "Parte dell'hardware del tuo computer richiede drivers ''proprietari'' per\n"
 "funzionare. Puoi trovare informazioni al riguardo presso: %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"
@@ -3984,11 +3936,11 @@ msgstr ""
 "A questo scopo, crea una partizione (o clicca su una gi� esistente).\n"
 "Quindi clicca su \"Punto di mount\" e assegna '/'"
 
-#: ../../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 "Devi avere una partizione di 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"
@@ -3998,55 +3950,59 @@ msgstr ""
 "\n"
 "Continuo comunque?"
 
-#: ../../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 "Devi avere una partizione FAT montata su /boot/efi"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Usa lo spazio libero"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Non c'� abbastanza spazio libero per allocare nuove partizioni"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Usa partizione esistente"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Non c'� una partizione esistente da usare"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Usa la partizione Windows per loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Che partizione vuoi usare per Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Scegli le dimensioni"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Dimensione partizione radice in Mb: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Dimensione partizione di swap in Mb: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Usa lo spazio libero della partizione Windows"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Quale partizione vuoi ridimensionare?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Calcolo i confini del filesystem di Windows "
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4055,13 +4011,13 @@ msgstr ""
 "Il ridimensionatore della FAT non riesce a gestire la tua partizione, \n"
 "si � verificato il seguente errore: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "La tua partizione Windows � troppo frammentata, per favore prima\n"
 "lancia ''defrag''"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4081,21 +4037,21 @@ msgstr ""
 "dati.\n"
 "Quando sei sicuro, premi Ok."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Quanto spazio vuoi lasciare per Windows sulla"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "partizione %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Ridimensionamento FAT fallito: %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)"
@@ -4103,33 +4059,33 @@ msgstr ""
 "Non c'� una partizione FAT da ridimensionare o da usare come loopback (o \n"
 "non c'� abbastanza spazio su di essa)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Cancella l'intero disco"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Rimuovi 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 "Hai pi� di un disco rigido, su quale vuoi installare 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 ""
 "TUTTE le partizioni esistenti e i loro dati verranno persi sul disco %s"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Partizionamento personalizzato del disco"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Usa fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4138,29 +4094,29 @@ msgstr ""
 "Adesso puoi partizionare %s\n"
 "Quando hai finito, non dimenticare di salvare usando 'w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Non hai sufficiente spazio libero sulla partizione Windows"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
-msgstr "Non trovo lo spazio per installare Linux-Mandrake"
+msgstr "Non trovo lo spazio per installare Mandrake Linux"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr ""
 "Il wizard di partizionamento di DrakX ha trovato le seguenti soluzioni:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Partizionamento fallito: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Sto attivando la rete"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Sto disattivando la rete"
 
@@ -4172,12 +4128,12 @@ msgstr ""
 "C'� stato un errore, ma non so come gestirlo correttamente.\n"
 "Continua a tuo rischio e pericolo."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Punto di mount doppio: %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"
@@ -4189,16 +4145,16 @@ msgstr ""
 "Controlla il cdrom su un sistema gi� installato digitando \"rpm -qpl "
 "mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Benvenuto a %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Nessun drive floppy disponibile"
 
-#: ../../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"
@@ -4212,32 +4168,32 @@ msgstr "Scegli la dimensione dell'installazione"
 msgid "Total size: "
 msgstr "Domensione totale: "
 
-#: ../../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 "Versione: %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 "Dimensioni: %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 "Scegli i pacchetti da installare"
 
-#: ../../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 "Installa"
 
-#: ../../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 "Installazione"
 
@@ -4245,7 +4201,7 @@ msgstr "Installazione"
 msgid "Please wait, "
 msgstr "Attendere per favore, "
 
-#: ../../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 restante "
 
@@ -4254,21 +4210,21 @@ msgid "Total time "
 msgstr "Tempo totale "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Sto preparando l'installazione"
 
-#: ../../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 "Installazione del pacchetto %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 "Vado avanti comunque?"
 
-#: ../../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 "C'� stato un errore ordinando i pacchetti:"
 
@@ -4276,29 +4232,33 @@ msgstr "C'� stato un errore ordinando i pacchetti:"
 msgid "Use existing configuration for X11?"
 msgstr "Usare la configurazione esistente per 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 ""
 "Il tuo sistema ha poche risorse. Potresti avere problemi installando\n"
-"Linux-Mandrake. In tal caso, in alternativa puoi provare un'installazione \n"
+"Mandrake Linux. In tal caso, in alternativa puoi provare un'installazione \n"
 "testuale. Per questo, premi 'F1' all'avvio da CDROM, poi digita 'text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Classe d'installazione"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Per favore, scegli una delle seguenti classi d'installazione:"
 
-#: ../../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 dimensione totale dei gruppi da te scelti � approssimativamente %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"
@@ -4313,7 +4273,7 @@ msgstr ""
 "Una bassa percentuale installer� solo i pacchetti pi� importanti;\n"
 "una percentuale del 100%% installer� tutti i pacchetti scelti."
 
-#: ../../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"
@@ -4329,85 +4289,69 @@ msgstr ""
 "Una bassa percentuale installer� solo i pacchetti pi� importanti;\n"
 "una percentuale del %d%% installer� tutti i pacchetti possibili."
 
-#: ../../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 "Potrai scegliere pi� specificatamente nella prossima fase."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Percentuale dei pacchetti da installare"
 
-#: ../../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 "Selezione Gruppi di Pacchetti"
 
-#: ../../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 "Selezione individuale pacchetti"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "Mostra i pacchetti selezionati automaticamente"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Espandi struttura"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Raggruppa struttura"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Cambia tra ordinamento semplice o a gruppi"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Domensione totale: %d / %d Mb"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Pacchetto errato"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nome: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Importanza: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Domensione totale: %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 ""
 "Non puoi selezionare questo pacchetto perch� non c'� abbastanza spazio \n"
 "rimanente per installarlo"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "I seguenti pacchetti stanno per essere installati"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "I seguenti pacchetti satanno per essere rimossi"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Non puoi selezionare/deselezionare questo pacchetto"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Questo � un pacchetto obbligatorio, non pu� essere deselezionato"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "Non puoi deselezionare questo pacchetto. � gi� installato"
 
-#: ../../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?"
@@ -4415,24 +4359,40 @@ msgstr ""
 "Questo pacchetto deve essere aggiornato\n"
 "Sei sicuro di volerlo deselezionare?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Non puoi deselezionare questo pacchetto. Deve essere aggiornato"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Mostra i pacchetti selezionati automaticamente"
+
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "Carica/Salva su floppy"
+
+#: ../../install_steps_gtk.pm_.c:461
+msgid "Updating package selection"
+msgstr "Aggiornamento scelta pacchetti"
+
+#: ../../install_steps_gtk.pm_.c:466
+msgid "Minimal install"
+msgstr "Installazione minima"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Sto valutando"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Per favore attendi, sto preparando l'installazione"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d pacchetti"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4497,15 +4457,15 @@ msgstr ""
 "intellettuale\n"
 "e al copyright applicabili ai programmi software.\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 "Accetta"
 
-#: ../../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 "Rifiuta"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4521,7 +4481,7 @@ msgstr ""
 "pronto. Se non ce l'hai, premi Annulla per evitare l'installazione da questo "
 "Cd-Rom."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "C'� stato un errore installando i pacchetti:"
 
@@ -4529,35 +4489,21 @@ msgstr "C'� stato un errore installando i pacchetti:"
 msgid "An error occurred"
 msgstr "Si � verificato un errore"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Per favore, scegli la lingua che verr� usata."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr ""
-"Puoi scegliere altre lingue che saranno disponibili dopo l'installazione"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Tutto"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Accordo di licenza"
 
-#: ../../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"
@@ -4611,7 +4557,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"
@@ -4648,7 +4594,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"
@@ -4671,11 +4617,11 @@ msgstr ""
 "\n"
 "Nel seguito intendiamo con \"Software\" il sistema operativo e le diverse "
 "componenti disponibili\n"
-"nella distribuzione Linux-Mandrake. Il Software include, ma non � limitato "
+"nella distribuzione Mandrake Linux. Il Software include, ma non � limitato "
 "a, l'insieme di\n"
 "programmi, metodi, regole e documentazione relativi al sistema operativo e "
 "alle diverse componenti\n"
-"della distribuzione Linux-Mandrake.\n"
+"della distribuzione Mandrake Linux.\n"
 "\n"
 "\n"
 "1. Licenza\n"
@@ -4718,7 +4664,7 @@ msgstr ""
 "commerciale, perdite finanziarie, oneri legali e sanzioni pecuniarie che "
 "derivino da sentenze giudiziarie, o qualsiasi altra perdita conseguente), "
 "dovuto al possesso e all'uso di componenti software, o derivante dall'aver "
-"scaricato componenti software da uno dei siti di Linux-Mandrake, che "
+"scaricato componenti software da uno dei siti di Mandrake Linux, che "
 "risultino proibiti o soggetti a limitazioni d'uso in alcune nazioni per "
 "effetto di leggi locali. Questa limitazione di responsabilit� si applica, ma "
 "non � limitata, alle componenti di crittografia sicura incluse nel "
@@ -4748,7 +4694,7 @@ msgstr ""
 "intellettuale e il copyright applicabili ai programmi software.La "
 "MandrakeSoft S.A. si riserva il diritto di modificare o adattare il "
 "Software, in parte o in tutto, con ogni mezzo e per qualsiasi scopo."
-"\"Mandrake\", \"Linux-Mandrake\" e i relativi logo sono propriet� della "
+"\"Mandrake\", \"Mandrake Linux\" e i relativi logo sono propriet� della "
 "MandrakeSoft S.A.\n"
 "\n"
 "\n"
@@ -4764,103 +4710,99 @@ msgstr ""
 "all'attenzione del Tribunale competente di Parigi - Francia.Per qualsiasi "
 "domanda riguardo questo documento, per favore contattate 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 "Tastiera"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Per favore, scegli l'impostazione della tastiera."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "Ecco la lista completa delle tastiere disponibili"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Classe d'installazione"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Che classe di installazione preferisci?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Installa/Aggiorna"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "� un'installazione o un aggiornamento?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Raccomandata"
 
-#: ../../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 "Esperto"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Aggiorna"
 
-#: ../../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 "Per favore, scegli il tipo del tuo mouse."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Porta del mouse"
 
-#: ../../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 "Per favore scegli a che porta seriale � connesso il mouse."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "Emulazione pulsanti"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "Emulazione pulsante 2"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "Emulazione pulsante 3"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Configuro schede 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 "Sto configurando 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 "nessuna partizione disponibile"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Controllo delle partizioni per trovare i punti di mount"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Scegli i punti di mount"
 
-#: ../../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"
@@ -4877,7 +4819,7 @@ msgstr ""
 "\n"
 "Ti va bene liberare tutte le partizioni?\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!"
@@ -4885,52 +4827,64 @@ msgstr ""
 "Diskdrake ha fallito la lettura della tabella delle partizioni.\n"
 "Continua a tuo rischio e pericolo!"
 
-#: ../../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 ""
+"Non c'� spazio libero per un bootstrap di 1MB! L'installazione continua, ma "
+"per avviare il sistema dovrai creare la partizione di bootstrap con DiskDrake"
+
+#: ../../install_steps_interactive.pm_.c:349
+msgid "No root partition found to perform an upgrade"
+msgstr "Non ho trovato una partizione root da aggiornare"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Partizione radice"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Qual'� la partizione radice (/) del tuo 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 ""
 "Devi resettare affinch� le modifiche alla tabella delle partizioni\n"
 "abbiano effetto"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Scegli le partizioni che vuoi formattare"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Controllo blocchi danneggiati?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Formattazione partizioni"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Sto creando e formattando il file %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 insufficiente per completare l'installazione. Per favore, aumentane le "
 "dimensioni"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Sto cercando i pacchetti disponibili"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Sto cercando i pacchetti da aggiornare"
 
-#: ../../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)"
@@ -4938,30 +4892,58 @@ msgstr ""
 "Il tuo sistema non ha abbastanza spazio rimanente per l'installazione o\n"
 "l'aggiornamento (%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 "Minima (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Raccomandata (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Personalizzata"
 
-#: ../../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 ""
+"Per favore scegli di caricare o salvare la selezione pacchetti su floppy.\n"
+"Il formato � lo stesso dei floppy generati con auto_install."
+
+#: ../../install_steps_interactive.pm_.c:525
+msgid "Load from floppy"
+msgstr "Carica da floppy"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "Caricamento da floppy"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "Selezione pacchetti"
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:532
+msgid "Insert a floppy containing package selection"
+msgstr "Inserisci un floppy contenente la scelta dei pacchetti"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Salva su floppy"
+
+#: ../../install_steps_interactive.pm_.c:605
+msgid "Selected size is larger than available space"
+msgstr "Lo spazio indicato � maggiore dello spazio disponibile"
+
+#: ../../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"
@@ -4971,12 +4953,12 @@ msgstr ""
 "Se non hai nessuno di questi CDs, clicca su Annulla.\n"
 "Se mancano solo alcuni dei CD, deselezionali, e poi clicca Ok."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom chiamato \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4985,11 +4967,21 @@ msgstr ""
 "Installazione del pacchetto %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Configurazione post installazione"
 
-#: ../../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 "Per favore inserisci il floppy di avvio utilizzato nel drive %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Per favore inserisci il floppy di aggiornamento moduli nel drive %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -5065,93 +5057,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 "Scegli un mirror da cui prendere i pacchetti"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Conessione al mirror per avere la lista dei pacchetti disponibili"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Per favore scegli i pacchetti che vuoi installare."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Qual'� il tuo fuso orario?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "L'orologio del tuo hardware � settato su GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+msgid "Hardware clock set to GMT"
+msgstr "L'orologio del tuo hardware � settato su GMT"
+
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr "Sincronizzazione automatica dell'ora (usando NTP)"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "Server NTP"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Server CUPS remoto"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Nessuna stampante"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Riepilogo"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Mouse"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Fuso orario"
 
-#: ../../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 "Stampante"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "Scheda ISDN"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Scheda audio"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "Scheda TV"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Che sistema di stampa vuoi usare?"
+#: ../../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 "File locali"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Scegli password per root"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Nessuna Password"
 
-#: ../../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 "Questa password � troppo semplice (deve essere almeno di %d caratteri)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Usa NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autenticazione"
+
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "Autenticazione LDAP"
+
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "pagine gialle"
+#: ../../install_steps_interactive.pm_.c:951
+msgid "LDAP Server"
+msgstr "Server LDAP"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
-msgstr "NIS di autentificazione"
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
+msgstr "Autenticazione NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "Dominio NIS"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "Server 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 "
@@ -5180,19 +5212,19 @@ msgstr ""
 "Se vuoi creare un disco di avvio per il tuo sistema, inserisci un floppy\n"
 "nel primo drive e premi \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Primo drive floppy"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Secondo drive floppy"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Salta"
 
-#: ../../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 "
@@ -5215,33 +5247,45 @@ msgstr ""
 "Mandrake, rendendo molto pi� facile il ripristino dopo gravi errori\n"
 "del sistema. Vuoi creare un disco di avvio per il tuo sistema?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Spiacente, nessun drive floppy disponibile"
 
-#: ../../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 ""
 "Scegli il drive floppy che vuoi utilizzare per creare il disco di avvio"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Inserisci il floppy nel drive %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Creazione disco di avvio"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Preparazione del bootloader"
 
-#: ../../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 ""
+"Apparentemente disponi di una macchina OldWorld o\n"
+" sconosciuta, il bootloader yaboot non andr� bene per te.\n"
+"L'installazione continuer�, ma dovrai usare\n"
+" BootX per avviare il tuo computer"
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "Vuoi usare 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?"
@@ -5249,60 +5293,61 @@ msgstr ""
 "Errore installando aboot, \n"
 "provo a forzare l'installazione anche se ci� distrugge la prima partizione?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Installa bootloader"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 "Installazione del bootloader fallita. Si � verificato il seguente errore:"
 
-#: ../../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 ""
 "Potrebbe essere necessario cambiare il dispositivo di boot Open Firmware\n"
 " per abilitare il bootloader. Se non vedete il prompt del bootloader\n"
 " dopo il riavvio, premete Command-Option-O-F al riavvio e digitate:\n"
-" setenv boot-device $of_boot,\\\\:tbxi\n"
+" setenv boot-device %s,\\\\:tbxi\n"
 " Poi digitate: shut-down\n"
 "Al boot successivo dovreste vedere il prompt del bootloader."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Basso"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Medio"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Alto"
 
-#: ../../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 "Scegli livello di sicurezza"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"Vuoi generare un floppy di installazione automatica per replicare\n"
-"questa installazione di 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 "Inserisci un floppy vuoto nel drive %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 "Sto creando il floppy di auto installazione"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5312,31 +5357,31 @@ msgstr ""
 "\n"
 "Vuoi veramente interrompere adesso?"
 
-#: ../../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 ""
 "Congratulazioni, l'installazione � completa.\n"
 "Rimuovi il disco di avvio e premi Invio per riavviare il sistema.\n"
 "Per informazioni su aggiornamenti disponibili per questa release di Linux\n"
-"Mandrake, consulta l'Errata disponibile su http://www.linux-mandrake.com/.\n"
+"Mandrake, consulta l'Errata disponibile su http://www.mandrakelinux.com/.\n"
 "Informazioni su come configurare il tuo sistema sono disponibili nel "
 "capitolo\n"
-"sulla post-installazione della Guida Ufficiale dell'Utente Linux Mandrake."
+"sulla post-installazione della Guida Ufficiale dell'Utente Mandrake Linux."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Crea il floppy di auto installazione"
 
-#: ../../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"
@@ -5350,41 +5395,58 @@ msgstr ""
 "\n"
 "Probabilmente preferirete ripetere l'installazione.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automatizzata"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Ripeti"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Salva scelta pacchetti"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Installazione Linux-Mandrake %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Installazione 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> muove il cursore   | <Barra> seleziona | <F12> videata succ."
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "kdesu manca"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Scegli un'azione"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Attendere prego"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Espandi struttura"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Raggruppa struttura"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Cambia tra ordinamento semplice o a gruppi"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5410,267 +5472,287 @@ msgstr "La tua scelta? (default %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "La tua scelta? (default %s inserisci 'none' per nessuna) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "Ceca (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 "Tedesca"
 
-#: ../../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 "Spagnola"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Finlandese"
 
-#: ../../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 "Francese"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Polacca"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Russa"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Svedese"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Tastiera 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 "Tastiera US"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "Albanese"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armena (vecchia)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armena (macchina da scrivere)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Armena (fonetica)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaidjana (latina)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaidjana (cirillica)"
-
-#: ../../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 "Brasiliana (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Bielorussa"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "Svizzera (mappa tedesca)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "Svizzera (mappa francese)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "Ceca (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "Ceca (Programmatori)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Tedesca (nessun tasto morto)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Danese"
 
-#: ../../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 (Norvegese)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estone"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgiana (mappa \"Russa\")"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgiana (mappa \"Latina\")"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Greca"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Israeliana"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Israeliana (Fonetica)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iraniana"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Islandese"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Italiana"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Giapponese 106 tasti"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Tastiera Coreana"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latino Americana"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Macedone"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Olandese"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituana AZERTY (vecchia)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituana AZERTY (nuova)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituana \"numero riga\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituana \"fonetica\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Posizione"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Macedone"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Olandese"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Polacca (mappa qwerty)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Polacca (mappa qwertz)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Canadese (Quebec)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "Romena (qwertz)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "Romena (qwerty)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "Russa (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Svedese"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Slovena"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovacca (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slovacca (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Slovacca (Programmatori)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbaidjana (cirillica)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Tastiera Thai"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Tastiera Thai"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turca (modulo \"F\" tradizionale)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turca (modello \"Q\" moderno)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ucraina"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "Tastiera US (internazionale)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"riga numerica\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
-msgstr "Yugoslava (latino/cirillico)"
+#: ../../keyboard.pm_.c:240
+msgid "Yugoslavian (latin)"
+msgstr "Yugoslava (latino)"
+
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Mount circolari %s\n"
 
-#: ../../lvm.pm_.c:70
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Prima rimuovi i volumi logici\n"
 
@@ -5782,170 +5864,225 @@ msgstr "nessuno"
 msgid "No mouse"
 msgstr "Nessun mouse"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Per favore prova il mouse"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Per attivare il mouse"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "MUOVI LA RUOTA!"
+
+#: ../../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 "Finisci"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Avanti ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Indietro"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
-msgstr "� corretto ?"
+msgstr "� corretto?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Configurazione di internet"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Connetti a Internet"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Vuoi provare a connetterti a Internet adesso?"
+#: ../../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 ""
+"Il modo pi� comune per connettersi con adsl � pppoe.\n"
+"Alcune connessioni usano pptp, poche usano dhcp.\n"
+"Se non sai, scegli 'usa pppoe'."
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Sto provando la tua connessione ..."
+#: ../../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 "Adesso il sistema � connesso a Internet"
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "usa dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Per ragioni di sicurezza, adesso verr� disconnesso."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "usa pppoe"
+
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "usa 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 ""
-"Il sistema non sembra essere connesso a Internet.\n"
-"Prova a configurare nuovamente la connessione."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Configurazione della rete"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "Configurazione ISDN"
+"Quale cliente dhcp vuoi usare?\n"
+"Quello predefinito � 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 ""
-"Scegli il tuo provider.\n"
-" Se non � nella lista, scegli Fuori Lista"
+"Nessun adattatore di rete ethernet � stato rilevato nel tuo sistema.\n"
+"Non posso configurare questo tipo di connessione."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Configurazione della Connessione"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Scegli l'interfaccia di rete"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Per favore riempi o controlla il campo qui sotto"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Per favore scegli quale adattatore di rete vuoi usare per connetterti a "
+"Internet"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ della scheda"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "nessuna scheda di rete trovata"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Memoria della scheda (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Sto configurando la rete"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "IO della scheda"
+#: ../../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 ""
+"Per favore inserisci il tuo nome host se lo conosci.\n"
+"Alcuni server DHCP richiedono il nome host per funzionare.\n"
+"Il tuo nome host dovrebbe essere un nome pienamente qualificato,\n"
+"come ''mybox.mylab.myco.com''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "IO_0 della scheda"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Nome host"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "IO_1 della scheda"
+#: ../../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 "Wizard della configurazione di rete"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Il tuo numero di telefono personale"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Modem ISDN esterno"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Nome del provider (es. provider.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Scheda ISDN interna"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Numero telefonico del provider"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Di che tipo � la tua connessione ISDN?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Dns 1 del Provider"
+#: ../../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 ""
+"Che configurazione ISDN preferisci?\n"
+"\n"
+"* La Vecchia configurazione usa isdn4net. Contiene strumenti potenti,\n"
+"  ma � difficile da configurare per un principiante, e non standard.\n"
+"\n"
+"* La Nuova configurazione � pi� facile da capire, pi� aderente allo\n"
+"  standard, ma dispone di un numero di strumenti inferiore.\n"
+"\n"
+"Raccomandiamo la configurazione leggera.\n"
+"\n"
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "Dns 2 del provider"
+#: ../../network/isdn.pm_.c:54
+msgid "New configuration (isdn-light)"
+msgstr "Nuova configurazione (isdn-light)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Modalit� di chiamata"
+#: ../../network/isdn.pm_.c:54
+msgid "Old configuration (isdn4net)"
+msgstr "Vecchia configurazione (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Login dell'account (nome utente)"
+#: ../../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 "Configurazione ISDN"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Password dell'account"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Scegli il tuo provider.\n"
+" Se non � nella lista, scegli Fuori Lista"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol"
+msgstr "Protocollo per l'Europa"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
-msgstr "Europa (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol (EDSS1)"
+msgstr "Protocollo per l'Europa (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
-msgstr "Resto del mondo"
+#: ../../network/isdn.pm_.c:184
+msgid "Protocol for the rest of the world"
+msgstr "Protocollo per il resto del mondo"
 
-#: ../../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 ""
-"Resto del mondo \n"
+"Protocollo per il resto del mondo \n"
 " no D-Channel (linee in affitto)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Quale protocollo vuoi usare?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Che tipo di scheda hai?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Non so"
 
-#: ../../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"
@@ -5958,19 +6095,19 @@ msgstr ""
 "\n"
 "Se hai una scheda PCMCIA, devi sapere IRQ e I/O della tua scheda.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Annulla"
 
-#: ../../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 "Qual'� la tua scheda 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."
@@ -5978,111 +6115,61 @@ msgstr ""
 "Ho trovato una scheda ISDN PCI, ma non so di che tipo. Per favore seleziona "
 "una scheda PCI nella prossima schermata."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "Non trovo nessuna scheda ISDN PCI. Per favore selezionane una \n"
 "nella prossima schermata."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Nessun adattatore di rete ethernet � stato rilevato nel tuo sistema.\n"
-"Non posso configurare questo tipo di connessione."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Scegli l'interfaccia di rete"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Per favore scegli quale adattatore di rete vuoi usare per connetterti a "
-"Internet"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Interfaccia di rete"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Sei d'accordo?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Sto per riavviare l'interfaccia di rete:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "Configurazione ADSL"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Vuoi effettuare la connessione all'avvio?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Per favore scegli a che porta seriale � connesso il tuo modem."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Opzioni di chiamata"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Nome connessione"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Numero telefonico"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "ID di accesso"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autenticazione"
+#: ../../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 "Basata su script"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Basata su terminale"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Nome dominio"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Primo server DNS (opzionale)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Secondo server DNS (opzionale)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"Sto per riavviare l'interfaccia di rete $netc->{NET_DEVICE}. Sei d'accordo?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6090,7 +6177,7 @@ msgstr ""
 "\n"
 "Puoi disconnetterti o riconfigurare la tua connessione."
 
-#: ../../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."
@@ -6098,11 +6185,11 @@ msgstr ""
 "\n"
 "Puoi configurare nuovamente la connessione."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Adesso sei connesso a Internet"
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -6110,102 +6197,56 @@ msgstr ""
 "\n"
 "Puoi connetterti a Internet o configurare nuovamente la connessione."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "In questo momento non sei connesso a Internet"
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Connetti a Internet"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Disconnetti da internet"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Configura una connessione di rete (LAN o Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Connessione & configurazione Internet"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Wizard della configurazione di rete"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Modem ISDN esterno"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Scheda ISDN interna"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Di che tipo � la tua connessione ISDN?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Connetti 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 ""
-"Il modo pi� comune per connettersi con adsl � pppoe.\n"
-"Alcune connessioni usano pptp, poche usano dhcp.\n"
-"Se non sai, scegli 'usa pppoe'."
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "usa dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "usa pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "usa 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 "Sto per riavviare l'interfaccia di rete %s. Sei d'accordo?"
-
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
-msgstr ""
-"Quale cliente dhcp vuoi usare?\n"
-"Quello predefinito � dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "Configurazione della rete"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Vuoi far ripartire la rete?"
+msgid "We are now going to configure the %s connection."
+msgstr "Adesso proseguiremo con la configurazione della connessione %s."
 
-#: ../../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 ""
-"Si � verificato un problema al momento di riavviare la rete: \n"
 "\n"
-"%s"
+"\n"
+"\n"
+"Stiamo per configurare la connessione %s.\n"
+"\n"
+"\n"
+"Premi OK per cominciare."
 
-#: ../../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 "Configurazione della rete"
+
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6217,7 +6258,7 @@ msgstr ""
 "Clicca su Ok per mantenere questa configurazione, o su Annulla per "
 "riconfigurare la rete e la connessione a Internet.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6230,72 +6271,113 @@ msgstr ""
 "Se non volete usare il riconoscimento automatico, deselezionate il \n"
 "pulsante d'opzione.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Scegli il profilo da configurare"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Usa il riconoscimento automatico"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Riconoscimento periferiche..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Connessione normale via modem"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "rilevato sulla porta: %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "Connessione ISDN"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "rilevato %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "Connessione DSL (o ADSL)"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+msgid "ADSL connection"
+msgstr "Connessione ADSL"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "rilevato sull'interfaccia %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Connessione via cavo"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "Rilevata connessione via cavo"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "Connessione LAN"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "rilevata scheda(e) ethernet"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Come vuoi connetterti a Internet?"
+#: ../../network/netconnect.pm_.c:190
+msgid "Choose the connection you want to configure"
+msgstr "Scegli il tipo di connessione che vuoi configurare"
+
+#: ../../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 ""
+"Hai configurato diversi tipi di connessione a Internet.\n"
+"Scegli quello che vuoi usare.\n"
+"\n"
+
+#: ../../network/netconnect.pm_.c:215
+msgid "Internet connection"
+msgstr "Connessione a Internet"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Vuoi effettuare la connessione all'avvio?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Configurazione della rete"
+
+#: ../../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 ""
+"Si � verificato un problema al momento di riavviare la rete: \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 ""
 "Congratulazioni, la configurazione della rete e di Internet � finita.\n"
 "\n"
-"Adesso questa configurazione verr� applicata al vostro sistema."
+"Adesso questa configurazione verr� applicata al vostro 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."
@@ -6303,31 +6385,7 @@ msgstr ""
 "Dopo che questo sar� stato fatto, vi raccomandiamo di riavviare il\n"
 "vostro ambiente X per evitare problemi relativi al cambio di hostname."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "nessuna scheda di rete trovata"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Sto configurando la rete"
-
-#: ../../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 ""
-"Per favore inserisci il tuo nome host se lo conosci.\n"
-"Alcuni server DHCP richiedono il nome host per funzionare.\n"
-"Il tuo nome host dovrebbe essere un nome pienamente qualificato,\n"
-"come ''mybox.mylab.myco.com''."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Nome host"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6339,7 +6397,7 @@ msgstr ""
 "Devi solo cliccare su OK per mantenere la precedente configurazione.\n"
 "Modifiche ai campi qui sotto cambieranno questa configurazione."
 
-#: ../../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"
@@ -6349,38 +6407,38 @@ msgstr ""
 "Ogni dato dovrebbe essere inserito come un indirizzo IP in notazione\n"
 "decimale puntata (ad esempio 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 "Sto configurando il dispositivo di rete %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (driver $module)"
+#: ../../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 "Indirizzo IP"
 
-#: ../../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 "IP automatico"
 
-#: ../../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'indirizzo IP deve essere in formato 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"
@@ -6392,43 +6450,149 @@ msgstr ""
 "come ''mybox.mylab.myco.com''.\n"
 "Puoi anche inserire l'indirizzo IP del gateway se ne hai uno."
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "Server DNS"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Dispositivo di gateway"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Configurazione dei proxy"
 
-#: ../../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 "Il proxy dovrebbe essere http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Il proxy dovrebbe essere ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Configurazione di internet"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Vuoi provare a connetterti a Internet adesso?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Sto provando la tua connessione ..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Adesso il sistema � connesso a Internet"
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Per ragioni di sicurezza, adesso verr� disconnesso."
+
+#: ../../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 ""
+"Il sistema non sembra essere connesso a Internet.\n"
+"Prova a configurare nuovamente la connessione."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Configurazione della Connessione"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Per favore riempi o controlla il campo qui sotto"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ della scheda"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Memoria della scheda (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "IO della scheda"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "IO_0 della scheda"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "IO_1 della scheda"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Il tuo numero di telefono personale"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Nome del provider (es. provider.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Numero telefonico del provider"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Dns 1 del provider (opzionale)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Dns 2 del provider (opzionale)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Scegli la tua tastiera"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Modalit� di chiamata"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+msgid "Connection speed"
+msgstr "Velocit� della connessione"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Tempo di connessione: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Login dell'account (nome utente)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Password dell'account"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Partizione estesa non supportata su questa piattaforma"
 
-#: ../../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 "
@@ -6438,26 +6602,21 @@ msgstr ""
 "L'unica soluzione � di muovere le tue partizioni primarie per avere il buco "
 "vicino alle partizioni estese"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Errore leggendo il file %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Ripristino da file %s fallito: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "File di backup errato"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Errore scrivendo sul file %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"
@@ -6488,49 +6647,212 @@ msgstr "bello"
 msgid "maybe"
 msgstr "forse"
 
-#: ../../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 "Stampante locale"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Stampante remota"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Server CUPS remoto"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Server lpd remoto"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Stampante di rete (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/Windows95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "Server della stampante"
 
-#: ../../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 della stampante"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+#, fuzzy
+msgid "Pipe job into a command"
+msgstr "Invia tramite pipe al comando"
+
+#: ../../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 "Scegli Connessione stampante"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Com'� collegata la stampante?"
+
+#: ../../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"
+"Con un server remoto CUPS, non devi configurare alcuna stampante\n"
+"adesso: le stampanti saranno individuate automaticamente.\n"
+"In caso di dubbi, scegli \"server remoto CUPS\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Nessuno"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Scegli la nuova dimensione"
+
+#: ../../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 "Chiudi"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Stampante remota"
+
+#: ../../printerdrake.pm_.c:129
+msgid "The IP address should look like 192.168.1.20"
+msgstr "L'indirizzo IP deve essere in formato 192.168.1.20"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Il numero della porta dovrebbe essere in cifre"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Stampante locale"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "IP del server CUPS"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Porta"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Configurazione metodo di avvio"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Riconoscimento periferiche..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Test delle porte"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Una stampante, modello \"%s\", � stata trovata su "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Dispositivo della stampante Locale"
 
-#: ../../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"
@@ -6538,37 +6860,59 @@ msgstr ""
 "A quale dispositivo � collegata la tua stampante \n"
 "(nota che /dev/lp0 � equivalente a LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Dispositivo della stampante"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr "Nome del dispositivo/file assente!"
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "Sto leggendo l'archivio dei driver CUPS"
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Opzioni stampante 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 usare una coda di stampa lpd remota, devi fornire\n"
 "il nome dell'host del server della stampante e il nome della coda\n"
-"sul server in cui dovranno essere parcheggiati i lavori di stampa."
+"sul server."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "Nome host remoto"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Nome coda remota"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Stampante remota"
+
+#: ../../printerdrake.pm_.c:320
+msgid "Remote host name missing!"
+msgstr "Nome host remoto assente!"
+
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Nome host remoto assente!"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opzioni Stampante SMB (Windows9x/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"
@@ -6582,29 +6926,37 @@ msgstr ""
 "come il nome di condivisione per la stampante cui vuoi accedere e ogni\n"
 "informazione utile riguardo nome dell'utente, password e gruppo di lavoro."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "Host del server SMB"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP del server SMB"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Nome di condivisione"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Gruppo di lavoro"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr "Devi indicare il nome del server o il numero IP dello stesso!"
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr "Il nome della condivisione Samba � assente!"
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "Opzioni stampante 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."
@@ -6614,302 +6966,834 @@ msgstr ""
 "del suo host TCP/IP) insieme al nome della coda di stampa per la\n"
 "stampante cui vuoi accedere e ogni nome utente e password applicabili."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Server della stampante"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Nome della coda di stampa"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr "Il nome del server NCP � assente"
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr "Il nome dellla coda NCP � assente!"
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Opzioni del socket della stampante"
 
-#: ../../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 stampare su una stampante di socket, devi indicare il\n"
 "nome host della stampante e opzionalmente il numero di porta."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Nome host della stampante"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Porta"
+#: ../../printerdrake.pm_.c:537
+msgid "Printer host name missing!"
+msgstr "Nome host della stampante assente!"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "URI della stampante"
+
+#: ../../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 ""
+"Potete indicare direttamente l'URI di accesso alla stampante. Tale URI deve "
+"essere conforme alle specifiche CUPS o Foomatic. Notate che non tutti i i "
+"tipi di URI sono supportati da tutti gli spooler."
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr "Dev'essere inserito un'URI valido!"
+
+#: ../../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 ""
+"Ogni stampante deve avere un nome (ad esempio lp).\n"
+"Non � indispensabile riempire i campi Descrizione e \n"
+"Posizione. Si tratta di commenti per gli utenti."
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Nome della stampante"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Descrizione"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Posizione"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Sto leggendo l'archivio dei driver CUPS"
+
+#: ../../printerdrake.pm_.c:793
+msgid "Printer model selection"
+msgstr "Scelta del modello della stampante"
+
+#: ../../printerdrake.pm_.c:794
+msgid "Which printer model do you have?"
+msgstr "Che modello di stampante hai?"
+
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Configurazione di 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 "Configurazione di 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
+#, fuzzy, c-format
+msgid "Option %s must be an integer number!"
+msgstr "La porta dev'essere indicata da un numero intero!"
+
+#: ../../printerdrake.pm_.c:1094
+#, fuzzy, c-format
+msgid "Option %s must be a number!"
+msgstr "La porta dev'essere indicata da un numero intero!"
+
+#: ../../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 "Vuoi stampare una pagina di prova?"
+
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Test delle 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 "S�, stampa entrambe le pagine di prova"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Stampante"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Programmi di utilit� standard"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
 msgstr ""
-"Puoi specificare direttamente l'URI per accedere alla stampante con CUPS."
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
-msgstr "Che tipo di stampante hai?"
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Stampa della(e) pagina(e) di prova..."
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "Vuoi provare la stampa?"
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Stampa della(e) pagina(e) di prova..."
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Stampa della(e) pagina(e) di 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 pagina(e) di prova � stata inviata al demone della stampante.\n"
+"La pagina(e) di prova � stata inviata alla stampante.\n"
 "Potrebbe occorrere un po' di tempo prima che la stampa inizi.\n"
 "Stato della stampa:\n"
 "%s\n"
 "\n"
 "Funziona correttamente?"
 
-#: ../../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 pagina(e) di prova � stata inviata al demone della stampante.\n"
+"La pagina(e) di prova � stata inviata alla stampante.\n"
 "potrebbe occorrere un po' di tempo prima che la stampa inizi.\n"
 "Funziona correttamente?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "S�, stampa la pagina di prova ASCII"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "S�, stampa la pagina di prova Postscript"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Nessuna stampante"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "S�, stampa entrambe le pagine di 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 stampante"
+#: ../../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 "Sto disattivando la rete"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Opzioni stampante"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Formato carta"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "Sto leggendo l'archivio dei driver CUPS"
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Espulsione pagina dopo il job?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Configurazione di internet"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Opzioni driver 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 "Opzioni profondit� colore"
+#: ../../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 "Stampa testo come 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 "Correggi lo stair-stepping del testo?"
+#: ../../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 "Numero di pagine per pagine di output"
+#: ../../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 "Margine destro/sinistro in punti (1/72 di pollice)"
+#: ../../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 "Margine superiore/inferiore in punti (1/72 di pollice)"
+#: ../../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 "Opzioni GhostScript supplementari"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Opzioni testo supplementari"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Ordine pagine inverso"
+#: ../../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 "Vorresti configurare una stampante?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
+"Il nome della stampante dovrebbe contenere solo lettere, numeri e il "
+"trattino di sottolineatura"
 
-#: ../../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 "Nessuna stampante"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
 msgstr ""
-"Ci sono le seguenti code di stampa.\n"
-"Puoi aggiungerne altre o cambiare quelle esistenti."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "Sto avviando 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 "Sto leggendo l'archivio dei driver CUPS"
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Scegli Connessione stampante"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Configura stampante"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Com'� collegata la stampante?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Sto attivando la tua connessione ..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Scegli connessione stampante remota"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Configura rete"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitor non configurato"
+
+#: ../../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 ""
-"Con un server remoto CUPS, non devi configurare alcuna stampante\n"
-"adesso: le stampanti saranno individuate automaticamente.\n"
-"In caso di dubbi, scegli \"server remoto CUPS\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Sto configurando la rete"
+
+#: ../../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 ""
-"Con un server remoto CUPS non devi configurare alcuna stampante\n"
-"adesso: le stampanti saranno individuate automaticamente,\n"
-"a meno che non dipendano da un server su una rete\n"
-"diversa. In quest'ultimo caso � necessario\n"
-"specificare l'indirizzo IP del server CUPS e, se vuoi, il numero della porta."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "IP del server 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 "Il numero della porta dovrebbe essere in cifre"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Che sistema di stampa vuoi usare?"
+
+#: ../../printerdrake.pm_.c:1548
+msgid "high"
+msgstr "alto"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Rimuovi coda"
+#: ../../printerdrake.pm_.c:1548
+msgid "paranoid"
+msgstr "paranoico"
 
-#: ../../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 ""
-"Il nome della stampante dovrebbe contenere solo lettere, numeri e il "
-"trattino di sottolineatura"
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Che sistema di stampa vuoi usare?"
+
+#: ../../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 ""
-"Ogni stampante ha bisogno di un nome (per esempio lp).\n"
-"Possono essere definiti altri parametri, come la descrizione della "
-"stampante \n"
-"o dove si trova. Che nome dovrebbe essere usato per questa\n"
-"stampante e in che modo � connessa?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Nome della stampante"
+#: ../../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 "Descrizione"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Posizione"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+msgid "Select Printer Spooler"
+msgstr "Scegli il sistema di stampa"
+
+#: ../../printerdrake.pm_.c:1728
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Che sistema di stampa (spooler) vuoi usare?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Configura stampante"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Opzioni stampante"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Sto leggendo l'archivio dei driver CUPS"
+
+#: ../../printerdrake.pm_.c:1845
+msgid "Would you like to configure printing?"
+msgstr "Vorresti configurare la stampa?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
+msgid ""
+"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 ""
+
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Modo Normale"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Predefinito)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Server CUPS remoto"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Server CUPS remoto"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+msgid "Add printer"
+msgstr "Aggiungi stampante"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Vuoi provare la configurazione ?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Configurazione di 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 "Connessione a Internet"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
+msgstr "Scelta del modello della stampante"
+
+#: ../../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 "Stampa della(e) pagina(e) di 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 "Stampante remota"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Sto leggendo l'archivio dei driver CUPS"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../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 "Vuoi far ripartire la rete?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Sto leggendo l'archivio dei driver CUPS"
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "Configurazione dei 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 ""
+"Benvenuto nell'utilit� di configurazione dei proxy.\n"
+"\n"
+"Qui potrai configurare i tuoi proxy http e ftp,\n"
+"con o senza login e password\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 ""
+"Per favore completa le informazioni relative al proxy http\n"
+"Lascia in bianco se non desideri un proxy http"
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr "URL"
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+msgid "port"
+msgstr "Porta"
+
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "L'URL dovrebbe cominciare con 'http:'"
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "Il numero della porta dovrebbe essere in cifre"
+
+#: ../../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 ""
+"Per favore completa le informazioni relative al proxy ftp\n"
+"Lascia in bianco se non desideri un proxy ftp"
+
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "L'URL dovrebbe cominciare con 'ftp:'"
+
+#: ../../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 ""
-"Ogni coda di stampa (a cui sono diretti i job di stampa) ha bisogno di\n"
-"un nome (spesso lp) e una directory di spool associata ad esso. Che\n"
-"nome e directory dovranno essere usati per questa coda e come � connessa\n"
-"la stampante?"
+"Per favore inserisci il login e la password per il proxy, se esistono.\n"
+"Lascia in bianco se non � necessario."
+
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "login"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Nome della coda"
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "Password"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Directory di spool"
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "digita ancora la password"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "Connessione stampante"
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "Le password non corrispondono. Prova ancora!"
 
-#: ../../raid.pm_.c:33
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Non posso aggiungere una partizione a _RAID_ formattato md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Non posso scrivere il file $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Non posso scrivere il file %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid fallito"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid fallito (forse manca raidtools?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Non ci sono abbastanza partizioni per RAID livello %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr "Lancia il sistema audio ALSA (Advanced Linux Sound Architecture)"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, un gestore di comandi periodici."
 
-#: ../../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."
@@ -6918,7 +7802,7 @@ msgstr ""
 "syslog. Pu� anche essere usato per spegnere la macchina quando la batteria\n"
 "� scarica."
 
-#: ../../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."
@@ -6927,7 +7811,7 @@ msgstr ""
 "at � stato lanciato, e lancia comandi batch quando il carico medio �\n"
 "sufficientemente basso."
 
-#: ../../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 "
@@ -6941,7 +7825,7 @@ msgstr ""
 "configurazione \n"
 "pi� potenti."
 
-#: ../../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 "
@@ -6953,7 +7837,7 @@ msgstr ""
 "Midnight Commander. Permette anche operazioni taglia/incolla via mouse in \n"
 "console e include supporto per dei menu a scomparsa in console."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
@@ -6961,7 +7845,7 @@ msgstr ""
 "HardDrake esegue un'indagine riguardo l'hardware, e opzionalmente\n"
 "configura l'hardware nuovo/cambiato."
 
-#: ../../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."
@@ -6969,7 +7853,7 @@ msgstr ""
 "Apache � un server per World Wide Web. � usato per gestire files HTML\n"
 "e 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 "
@@ -6983,7 +7867,7 @@ msgstr ""
 "di molti servizi, inclusi telnet, ftp, rsh, e rlogin. Disabilitando inetd\n"
 "si disabilitano tutti i servizi di cui � responsabile."
 
-#: ../../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."
@@ -6991,7 +7875,7 @@ msgstr ""
 "Lancio del filtro dei pacchetti per la serie di kernel 2.2, allo\n"
 "scopo di impostare un firewall che protegga la tua macchina da intrusioni."
 
-#: ../../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"
@@ -7001,7 +7885,7 @@ msgstr ""
 "/etc/sysconfig/keyboard, che pu� essere scelta usando l'utilit� kdbconfig.\n"
 "Dovresti lasciarlo abilitato per la maggior parte delle macchine."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
@@ -7009,11 +7893,11 @@ msgstr ""
 "Rigenerazione automatica dell'intestazione del kernel /boot per\n"
 "/usr/include/linux/{autoconf,versione}.h"
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr "Individuazione e configurazione automatica dell'hardware al boot."
 
-#: ../../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."
@@ -7021,7 +7905,7 @@ msgstr ""
 "Linuxconf talvolta deve eseguire alcune operazioni al momento\n"
 "del boot per gestire la configurazione del sistema."
 
-#: ../../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)."
@@ -7029,7 +7913,7 @@ msgstr ""
 "lpd � il demone di stampa richiesto perch� lpr funzioni propriamente. �\n"
 "fondamentalmente un server che distribuisce i job di stampa alle stampanti."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
@@ -7037,7 +7921,7 @@ msgstr ""
 "Linux Virtual Server, usato per impostare un server ad alte prestazioni\n"
 "e alta disponibilit�."
 
-#: ../../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."
@@ -7045,7 +7929,7 @@ msgstr ""
 "named (BIND) � un Domain Name Server (DNS) utilizzato per risolvere\n"
 "nomi host in indirizzi 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."
@@ -7053,7 +7937,7 @@ msgstr ""
 "Monta e smonta tutti i punti di mount di Network File System (NFS),\n"
 "SMB (Lan Manager/Windows), e NCP (Netware)."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -7061,7 +7945,7 @@ msgstr ""
 "Attiva/Disattiva tutte le interfacce di rete di cui � previsto l'avvio\n"
 "al momento del boot."
 
-#: ../../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"
@@ -7071,7 +7955,7 @@ msgstr ""
 "TCP/IP. Questo servizio consente funzionalit� di server NFS, che sono\n"
 "configurate tramite il file /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."
@@ -7080,7 +7964,7 @@ msgstr ""
 "IP.\n"
 "Questo servizio consente funzionalit� di blocco dei file NFS."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
@@ -7088,11 +7972,11 @@ msgstr ""
 "Attiva automaticamente il tasto relativo al tastierino numerico\n"
 "per la console e XFree al momento del boot."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr "Supporto per le stampanti Windows OKI 4w e compatibili."
 
-#: ../../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 "
@@ -7104,7 +7988,7 @@ msgstr ""
 "� \n"
 "sicuro da avere installato anche su macchine che non lo richiedono."
 
-#: ../../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 "
@@ -7115,7 +7999,7 @@ msgstr ""
 "come NFS e NIS. Il server portmap deve essere in esecuzione su macchine che\n"
 "agiscono come server per protocolli che fanno uso di meccanismi 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."
@@ -7123,7 +8007,7 @@ msgstr ""
 "Postfix � un Agente di Trasporto di Posta, un programma che\n"
 "sposta messaggi da una macchina ad un'altra."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -7131,7 +8015,7 @@ msgstr ""
 "Salva e ripristina l'entropia del sistema per una generazione di numeri\n"
 "casuali di alta qualit�."
 
-#: ../../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"
@@ -7139,7 +8023,7 @@ msgstr ""
 "Assegna dispositivi raw a dispositivi a blocchi (quali le partizioni\n"
 "di un disco rigido), da usare con applicazioni come 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"
@@ -7149,7 +8033,7 @@ msgstr ""
 "mezzo del protocollo RIP. Mentre RIP � largamente usato in piccole reti, \n"
 "protocolli di routing pi� complessi sono necessari per reti pi� complesse."
 
-#: ../../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."
@@ -7157,7 +8041,7 @@ msgstr ""
 "Il protocollo rstat permette agli utenti di una rete di recuperare\n"
 "misurazioni delle prestazioni per ogni macchina di quella rete."
 
-#: ../../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."
@@ -7165,7 +8049,7 @@ msgstr ""
 "Il protocollo rusers permette agli utenti di una rete di identificare\n"
 "chi � connesso su una macchina interrogata in proposito."
 
-#: ../../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)."
@@ -7174,11 +8058,11 @@ msgstr ""
 "tutti gli utenti connessi a una macchina su cui gira il demone rwho\n"
 "(similarmente a finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
 msgstr "Lancia il sistema audio sulla tua macchina"
 
-#: ../../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."
@@ -7186,31 +8070,69 @@ msgstr ""
 "Syslog � una utilit� che molti demoni usano per aggiungere messaggi\n"
 "in vari file di log di sistema. � una buona idea lanciare sempre syslog."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr "Carica i driver per i tuoi dispositivi USB."
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr "Avvia il server di caratteri (indispensabile per eseguire 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 "Scegli quali servizi saranno lanciati automaticamente all'avvio."
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Stampante"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../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 "Opzioni stampante lpd remota"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Database"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "Server"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "in esecuzione"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "fermato"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Servizi e demoni"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -7218,11 +8140,16 @@ msgstr ""
 "Spiacente, ma non ci sono ulteriori\n"
 "informazioni riguardo questo servizio."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "Al boot"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Installazione del pacchetto %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"
@@ -7230,15 +8157,65 @@ msgstr ""
 "Non posso leggere la tua tabella delle partizioni, � troppo\n"
 "corrotta per me :( . Prover� a cancellare le partizioni rovinate."
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+msgid "Error!"
+msgstr "Errore!"
+
+#: ../../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 "Configurazione post installazione"
+
+#: ../../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 "Configurazione metodo di avvio"
+
+#: ../../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 "Congratulazioni!"
+
+#: ../../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 "Condivisione connessione Internet"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Condivisione della connessione a Internet attualmente abilitata"
 
-#: ../../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"
@@ -7250,31 +8227,31 @@ msgstr ""
 "\n"
 "Cosa vorresti fare?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "disabilita"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "abbandona"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "riconfigura"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Sto disattivando i server..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "La condivisione della connessione a Internet ora � disabilitata."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Condivisione connessione Internet attualmente disabilitata"
 
-#: ../../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"
@@ -7286,28 +8263,19 @@ msgstr ""
 "\n"
 "Cosa vorresti fare?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "abilita"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "Sto attivando i server..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "La condivisione della connessione a Internet ora � abilitata."
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr ""
-"Non � stato possibile interpretare il contenuto del file di configurazione."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "File di configurazione sconosciuto"
-
-#: ../../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 "
@@ -7324,21 +8292,21 @@ msgstr ""
 "Nota: � necessario un Adattatore di Rete dedicato per realizzare una\n"
 "Rete di Area Locale (LAN)."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interfaccia %s (usa il modulo %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
 msgstr "Interfaccia %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Nessun adattatore di rete nel tuo 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."
@@ -7347,6 +8315,10 @@ msgstr ""
 "favore lancia l'utilit� di configurazione hardware."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Interfaccia di rete"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7361,7 +8333,7 @@ msgstr ""
 "\n"
 "Sto per configurare la tua rete locale (LAN) usando quell'adattatore."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -7369,24 +8341,25 @@ msgstr ""
 "Per favore scegli quale adattatore di rete sar� connesso alla tua rete "
 "locale (LAN)."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Attenzione, l'adattatore di rete � gi� configurato. Procedo a una nuova "
 "configurazione."
 
-#: ../../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 ""
 "Trovato conflitto potenziale dell'indirizzo LAN nella configurazione "
-"corrente di $_!\n"
+"corrente di %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Rilevata configurazione di 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."
@@ -7394,24 +8367,21 @@ msgstr ""
 "Attenzione! � stata rilevata una configurazione di firewall esistente. "
 "Potrebbe avere bisogno di alcuni aggiustamenti manuali dopo l'installazione."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Sto configurando..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Sto configurando gli script, installando il software, avviando i server..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Problemi nell'installazione del pacchetto $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Congratulazioni!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Problemi nell'installazione del pacchetto %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 "
@@ -7421,24 +8391,24 @@ msgstr ""
 "Ora puoi condividere la connessione a Internet con altri computers sulla tua "
 "rete locale (LAN) usando la configurazione di rete automatica (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "Il setup � gi� stato fatto, ma � attualmente disabilitato."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "Il setup � gi� stato fatto, ed � attualmente abilitato."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr ""
 "Nessuna condivisione della connessione a Internet configurata in precedenza."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Configurazione della connessione a Internet"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7453,83 +8423,82 @@ msgstr ""
 "\n"
 "Cliccate su ``Configura'' se volete lanciare il Wizard di configurazione."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Configurazione della rete (%d adattatori)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
 msgstr "Profilo: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "Cancella profilo..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Profilo da cancellare:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Nuovo profilo..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Nome del profilo da creare:"
+#: ../../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 "Nome host: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Accesso a Internet"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "Interfaccia:"
 
-#: ../../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 "Connesso"
 
-#: ../../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 "Non connesso"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Connetti..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Disconnetti..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
 msgstr "Sto attivando la tua connessione ..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "Sto disattivando la tua connessione ..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7541,120 +8510,119 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "come root."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "Adesso il sistema � disconnesso."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Configura l'accesso a Internet"
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "Configurazione LAN (rete locale)"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adattatore"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Driver"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Status:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Configura rete locale (LAN)"
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Modo Normale"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Applica"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Per favore attendi... sto applicando la configurazione"
 
-#: ../../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 ""
+"Non disponi di nessuna interfaccia configurata.\n"
+"Per prima cosa configurale cliccando su 'Configura'"
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "Configurazione rete locale (LAN)"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adattatore %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "Protocollo di boot"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Attivato/a al momento del boot"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "Cliente DHCP"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Disabilita"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Attivo"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Abilita"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Attivo"
 
-#: ../../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 ""
+"Non disponi di una connessione a Internet.\n"
+"Creane una cliccando su 'Configura'"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Configurazione della connessione a Internet"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Configurazione della connessione a Internet"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Tipo di connessione: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parametri"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Dns 1 del provider (opzionale)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Dns 2 del provider (opzionale)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Scheda ethernet"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "Cliente DHCP"
 
@@ -7725,15 +8693,30 @@ msgstr ""
 "Eredita le caratteristiche del livello 4, ma ora il sistema � completamente\n"
 "chiuso. Le funzioni di sicurezza sono al massimo."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Sto settando il livello di sicurezza"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Scegli le opzioni per il 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 "Sto settando il livello di sicurezza"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
-msgstr "Centro di controllo"
+msgstr "Centro di Controllo"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Scegli l'utilit� che vuoi usare"
 
@@ -7762,83 +8745,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Non riesco ad avviare l'aggiornamento diretto !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "nessun serial_usb trovato\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Emula il terzo pulsante?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Per favore prova il mouse"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "Monitoraggio della rete"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Statistiche"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "Velocit� in trasmissione: "
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "Velocit� in ricezione: "
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Chiudi"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "Mi sto connettendo a Internet"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "Mi sto disconnettendo da internet"
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "La disconnessione da internet � fallita"
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "La disconnessione da internet � stata effettuata"
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Connessione effettuata"
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"La connessione � fallita.\n"
-"Verifica la tua configurazione nel Centro di controllo Mandrake."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "inviato/a: "
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "ricevuto/a: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Connetti"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Disconnetti"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Configurazione del firewall!"
@@ -7869,21 +8783,90 @@ msgstr ""
 "\n"
 "Clicca su Configura per configurare un firewall standard"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Scegli la tua lingua"
+
+# there is no room to put "Scegli classe d'installazione"
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Classe d'installazione"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Ricerca del disco fisso"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Configura mouse"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Scegli la tua tastiera"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Sicurezza"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Configura il filesystem"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formatta partizioni"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Pacchetti da installare"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Installa sistema"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Aggiungi un utente"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Configura rete"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Configura servizi"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Crea disco di boot"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Installa bootloader"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Configura X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Termina installazione"
+
+#: ../../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 ""
 "Configuratore di firewall minimo\n"
 "\n"
-"Configurazione di un firewall personale per questo sistema Linux Mandrake.\n"
+"Configurazione di un firewall personale per questo sistema Mandrake Linux.\n"
 "Per una soluzione firewall potente e dedicata, per favore rivolgiti\n"
 "alla distribuzione specializzata 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"
@@ -7901,7 +8884,7 @@ msgstr ""
 "disabilitarlo. Potrai cambiare queste impostazioni quando vorrai\n"
 "usando di nuovo questa applicazione!"
 
-#: ../../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"
@@ -7913,7 +8896,7 @@ msgstr ""
 "puoi rispondere NO tranquillamente.\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"
@@ -7925,7 +8908,7 @@ msgstr ""
 "Internet, per favore rispondi 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"
@@ -7940,7 +8923,7 @@ msgstr ""
 "la tua password. Invece ssh effettua la cifratura e non permette che\n"
 "qualcuno origli alle tue spalle."
 
-#: ../../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"
@@ -7952,7 +8935,7 @@ msgstr ""
 "Ti consigliamo caldamente di rispondere NO in questo caso, e di\n"
 "usare ssh invece di 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"
@@ -7965,7 +8948,7 @@ msgstr ""
 "inviata con FTP pu� essere intercettata da qualche cracker, dato che\n"
 "anche FTP non fa uso di cifratura nel trasmettere le password.\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"
@@ -7978,7 +8961,7 @@ msgstr ""
 "dovreste nasconderlo dietro il 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"
@@ -7990,7 +8973,7 @@ msgstr ""
 "(non basata su interfaccia web) su questa macchina.\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"
@@ -8002,7 +8985,7 @@ msgstr ""
 "questo (assegnazione dinamica), dobbiamo specificare questa\n"
 "impostazione. Il tuo indirizzo IP � assegnato dinamicamente?\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"
@@ -8017,7 +9000,7 @@ msgstr ""
 "rete pi� grande e non hai mai sentito parlare di qualcosa del genere,\n"
 "probabilmente puoi rispondere NO."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -8029,289 +9012,2663 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Non riesco ad aprire %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Non riesco ad aprire %s in scrittura: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clienti per vari protocolli, incluso ssh"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Sviluppo"
+msgid "Network Computer (client)"
+msgstr "Computer connesso alla rete (cliente)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Workstation"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Server NFS, server SMB, server proxy, server SSH"
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Office"
+msgstr "Office"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Gestione di informazioni personali"
+msgid "Gnome Workstation"
+msgstr "Workstation grafica con GNOME"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Grafica"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Utilit� per il tuo Palm Pilot o Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Workstation"
+msgstr "Workstation"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computer connesso alla rete (cliente)"
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Utilit� audio: riproduttori mp3 o midi, mixer, etc"
+msgid "Domain Name and Network Information Server"
+msgstr "Server di nomi di dominio (DNS) e informazioni sulla rete"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Computer con accesso a Internet"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programmi Office: wordprocessor (kword, abiword), fogli elettronici "
+"(kspread, gnumeric), visualizzatori pdf, etc"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Utilit� audio: riproduttori mp3 o midi, mixer, etc"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Computer multimediale"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libri e Howto su Linux e il software libero"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Gruppo di programmi per leggere e inviare posta e news (pine, mutt, tin..) e "
-"per navigare il Web"
+msgid "KDE Workstation"
+msgstr "Workstation grafica con KDE"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Librerie di sviluppo, programmi e file include per C e C++"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Server di nomi di dominio (DNS) e informazioni sulla rete"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programmi per gestire le tue finanze, come gnucash"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Set di utilit� per posta, news, web, file transfer, e chat"
+
+#: ../../share/compssUsers:999
+msgid "Database"
+msgstr "Database"
 
 #: ../../share/compssUsers:999
 msgid "PostgreSQL or MySQL database server"
 msgstr "Server di database PostgreSQL o MySQL"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Server NFS, server SMB, server proxy, server SSH"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Strumenti per semplificare la configurazione del computer"
+
+#: ../../share/compssUsers:999
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Suono"
+
+#: ../../share/compssUsers:999
+msgid "Utilities"
+msgstr "Programmi di utilit�"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "Documentazione"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Console Tools"
+msgstr "Programmi da linea di comando"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Programmi di utilit�"
+msgid "Postfix mail server, Inn news server"
+msgstr "Server di posta Postfix, server di news Inn"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgid "Internet station"
+msgstr "Computer con accesso a Internet"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ambiente grafico"
+msgid "Multimedia station"
+msgstr "Computer multimediale"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Suono"
+msgid "Configuration"
+msgstr "Configurazione"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programmi di svago: azione, da tavolo, strategia, etc"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Altri desktop grafici (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Riproduttori video e programmi di editing"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"Il K Desktop Environment, l'ambiente grafico di base con una collezione di "
+"utilit� che lo accompagnano"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Programmi da linea di comando"
+msgid "Graphical Environment"
+msgstr "Ambiente grafico"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programmi di riproduzione/modifica audio e video"
+msgid "Development"
+msgstr "Sviluppo"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Workstation scientifica"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache e Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editor, shell, programmi di utilit� riguardo i file, terminali"
+msgid "Tools to create and burn CD's"
+msgstr "Utilit� per creare e masterizzare CD"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libri e Howto su Linux e il software libero"
+msgid "Office Workstation"
+msgstr "Postazione di lavoro con programmi Office"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Un ambiente grafico con un set di applicazioni user-friendly e utilit� per "
-"il desktop"
+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 "Server di posta Postfix, server di news Inn"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programmi grafici come The Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Giochi"
+msgid "DNS/NIS "
+msgstr "DNS/NIS"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Librerie di sviluppo, programmi e file include per C e C++"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
 msgstr "Server di rete"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programmi grafici come The Gimp"
+msgid "Mail/Groupware/News"
+msgstr "Posta/Groupware/Newsgroup"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Postazione di lavoro con programmi Office"
+msgid "Game station"
+msgstr "Computer predisposto per i giochi"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"Il K Desktop Environment, l'ambiente grafico di base con una collezione di "
-"utilit� che lo accompagnano"
+msgid "Video players and editors"
+msgstr "Riproduttori video e programmi di editing"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Altri desktop grafici (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafica"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Utilit� per creare e masterizzare CD"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programmi di svago: azione, da tavolo, strategia, etc"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Masterizzazione CD"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Gruppo di programmi per leggere e inviare posta e news (pine, mutt, tin..) e "
+"per navigare il Web"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
 msgstr "Archiviazione, emulatori, monitoraggio"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
+msgid "Personal Finance"
+msgstr "Finanza Personale"
 
 #: ../../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 ""
-"Programmi Office: wordprocessor (kword, abiword), fogli elettronici "
-"(kspread, gnumeric), visualizzatori pdf, etc"
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Server"
+"Un ambiente grafico con un set di applicazioni user-friendly e utilit� per "
+"il desktop"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanza Personale"
+msgid "Clients for different protocols including ssh"
+msgstr "Clienti per vari protocolli, incluso ssh"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configurazione"
+msgid "Internet gateway"
+msgstr "Gateway per Internet"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Workstation grafica con KDE"
+msgid "Sound and video playing/editing programs"
+msgstr "Programmi di riproduzione/modifica audio e video"
 
 #: ../../share/compssUsers:999
 msgid "Other Graphical Desktops"
 msgstr "Altri desktop grafici"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache e Pro-ftpd"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editor, shell, programmi di utilit� riguardo i file, terminali"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Posta/Groupware/Newsgroup"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programmi per gestire le tue finanze, come gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Workstation grafica con GNOME"
+msgid "Games"
+msgstr "Giochi"
 
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Gateway per Internet"
+msgid "Personal Information Management"
+msgstr "Gestione di informazioni personali"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Utilit� per il tuo Palm Pilot o Visor"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Masterizzazione CD"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Computer predisposto per i giochi"
+msgid "Scientific Workstation"
+msgstr "Workstation scientifica"
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc."
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Vuoi far ripartire la rete?"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Strumenti per semplificare la configurazione del computer"
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Sei d'accordo?"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Set di utilit� per posta, news, web, file transfer, e chat"
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Sto per riavviare l'interfaccia di rete:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Sto per riavviare l'interfaccia di rete %s. Sei d'accordo?"
+
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "A meno che tu non sia sicuro del contrario, la scelta usuale � \"/dev/hda"
+#~ "\"\n"
+#~ "(il disco IDE principale sul canale primario) o \"/dev/sda\" (il primo "
+#~ "disco SCSI)."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Ci sono le seguenti code di stampa.\n"
+#~ "Puoi aggiungerne altre o cambiare quelle esistenti."
+
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Tempo di connessione: "
+
+#~ 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 "
+#~ "you\n"
+#~ "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, "
+#~ "it\n"
+#~ "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 "
+#~ "name.\n"
+#~ "This is the name this particular user will use to log into the system. "
+#~ "You\n"
+#~ "can change it. You then have to enter a password here. A non-privileged\n"
+#~ "(regular) user's password is not as crucial as that of root from a "
+#~ "security\n"
+#~ "point of view, but that is no reason to neglect it - after all, your "
+#~ "files\n"
+#~ "are at risk.\n"
+#~ "\n"
+#~ "If you click on Accept user, you can then add as many as you want. Add a\n"
+#~ "user for each one of your friends: your father or your sister, for "
+#~ "example.\n"
+#~ "When you finish adding all the users you want, select Done.\n"
+#~ "\n"
+#~ "Clicking the Advanced button allows you to change the default shell for\n"
+#~ "that user (bash by default)."
+#~ msgstr ""
+#~ "GNU/Linux � un sistema operativo multiutente, e questo significa che\n"
+#~ "ciascun utente pu� disporre di una configurazione personalizzata, di uno\n"
+#~ "spazio per i propri file, e cos� via; consultate il ``Manuale "
+#~ "dell'utente''\n"
+#~ "per saperne di pi�. Ma, a differenza di root, che � l'amministratore del\n"
+#~ "sistema, gli utenti che aggiungerete adesso non avranno il diritto di\n"
+#~ "cambiare nulla, se non i propri file e la propria configurazione. "
+#~ "Dovrete\n"
+#~ "crearne almeno uno per voi stessi, e dovreste usare quello per l'uso\n"
+#~ "quotidiano: per quanto sia molto comodo entrare nel sistema come root "
+#~ "tutti\n"
+#~ "i giorni, potrebbe anche essere molto pericoloso! Anche un errore banale\n"
+#~ "potrebbe significare un sistema non pi� in grado di funzionare\n"
+#~ "correttamente. Se, invece, commettete un errore, anche grave, in qualit� "
+#~ "di\n"
+#~ "utente normale, potreste perdere parte dei vostri dati, ma non\n"
+#~ "compromettere l'intero sistema.\n"
+#~ "\n"
+#~ "Prima di tutto, inserite il vostro nome reale. Naturalmente questo non �\n"
+#~ "obbligatorio: potete digitare quello che volete. Fatto questo, DrakX\n"
+#~ "prender� la prima parola che avete inserito nel campo di testo e la "
+#~ "copier�\n"
+#~ "alla voce Nome utente. Questo � il nome che userete per accedere al "
+#~ "sistema\n"
+#~ "(non temete, se non andasse bene potrete cambiarlo in un secondo "
+#~ "momento).\n"
+#~ "Adesso digitate una password per questo utente. La password di un utente\n"
+#~ "non privilegiato dal punto di vista della sicurezza non � cruciale come\n"
+#~ "quella di root, ovviamente, ma non c'� motivo di essere frettolosi: dopo\n"
+#~ "tutto, si tratta dei vostri file.\n"
+#~ "\n"
+#~ "Se cliccate su Accetta utente, potrete aggiungerne un altro, e altri\n"
+#~ "ancora, a vostra discrezione. Aggiungete un utente per ciascuno dei "
+#~ "vostri\n"
+#~ "amici, oppure per vostro padre e vostro fratello, ad esempio. Dopo aver\n"
+#~ "aggiunto tutti gli utenti che volete, selezionate Fatto.\n"
+#~ "\n"
+#~ "Cliccando sul pulsante Avanzato potrete cambiare la shell; per "
+#~ "quell'utente\n"
+#~ "(come opzione predefinita � bash)."
+
+#~ 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. Check the CD labels and\n"
+#~ "highlight the boxes corresponding to the CDs you have available for\n"
+#~ "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"
+#~ " * \"Workstation\": if you plant to use your machine as a workstation,\n"
+#~ "select one or more of the corresponding groups.\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"
+#~ " * \"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"
+#~ "Moving the mouse cursor over a group name will display a short "
+#~ "explanatory\n"
+#~ "text about that group.\n"
+#~ "\n"
+#~ "Clicking the Advanced button will allow you to select the \"Individual\n"
+#~ "package selection\" option. This is useful if you are familiar with the\n"
+#~ "packages being offered or if you want to have total control over what "
+#~ "will\n"
+#~ "be installed.\n"
+#~ "\n"
+#~ "If you started the installation in \"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 ""
+#~ "Adesso � il momento di indicare i programmi che volete siano installati "
+#~ "sul\n"
+#~ "vostro sistema. Ci sono migliaia di programmi disponibili per Mandrake\n"
+#~ "Linux, e nessuno si aspetta che li conosciate tutti a memoria.\n"
+#~ "\n"
+#~ "Se state effettuando un'installazione standard da CDROM, per prima cosa "
+#~ "vi\n"
+#~ "verr� chiesto di specificare i CD in vostro possesso: controllate i CD\n"
+#~ "della distribuzione, cliccate sulle caselle corrispondenti ai CD di cui\n"
+#~ "disponete e infine sul pulsante OK quando sarete pronti per continuare.\n"
+#~ "\n"
+#~ "I pacchetti sono organizzati in gruppi corrispondenti a usi particolari\n"
+#~ "della vostra macchina. I gruppi stessi sono divisi in quattro sezioni:\n"
+#~ "\n"
+#~ " * \"Workstation\": scegliete uno o pi� dei gruppi di questa sezione se "
+#~ "la\n"
+#~ "vostra macchina verr� utilizzata prevalentemente come workstation.\n"
+#~ "\n"
+#~ " * \"Ambiente grafico\": scegliete qui il vostro ambiente grafico "
+#~ "preferito.\n"
+#~ "Indicatene almeno uno se desiderate avere una workstation grafica!\n"
+#~ "\n"
+#~ " * \"Sviluppo\": se la macchina verr� usata per lo sviluppo di software\n"
+#~ "scegliete i gruppi appropriati.\n"
+#~ "\n"
+#~ " * \"Server\": se la macchina verr� sfruttata come server, infine, qui\n"
+#~ "potrete scegliere i servizi pi� comuni che verranno installati.\n"
+#~ "\n"
+#~ "Spostando il puntatore del mouse sul nome di un gruppo verr� mostrato un\n"
+#~ "breve testo di informazioni riguardo quest'ultimo.\n"
+#~ "\n"
+#~ "Cliccando sul pulsante Avanzato potrete scegliere l'opzione \"Selezione\n"
+#~ "individuale dei pacchetti\". Questa � utilissima se conoscete bene i\n"
+#~ "pacchetti presenti nella distribuzione o se desiderate avere il totale\n"
+#~ "controllo di ci� che verr� installato.\n"
+#~ "\n"
+#~ "Se avete cominciato l'installazione in modalit� ``Aggiornamento'', "
+#~ "potete\n"
+#~ "deselezionare tutti i gruppi per evitare di installare nuovi pacchetti, "
+#~ "in\n"
+#~ "questo modo effettuerete soltanto il recupero o l'aggiornamento del "
+#~ "sistema\n"
+#~ "esistente."
+
+#~ 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 "
+#~ "will\n"
+#~ "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 install "
+#~ "the\n"
+#~ "listed services and they will be started automatically by 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"
+#~ "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 ""
+#~ "Per finire, a seconda che abbiate scelto di indicare i pacchetti su base\n"
+#~ "individuale o meno, vi verr� mostrata una struttura ad albero contenente\n"
+#~ "tutti i pacchetti organizzati in gruppi e sotto-gruppi. Mentre sfogliate\n"
+#~ "questa lista gerarchica potrete selezionare interi gruppi, sotto-gruppi "
+#~ "o\n"
+#~ "singoli pacchetti.\n"
+#~ "\n"
+#~ "Quando selezionate un pacchetto all'interno dell'albero, compare una\n"
+#~ "descrizione dello stesso sulla destra. Una volta terminata la scelta,\n"
+#~ "cliccate sul pulsante Installa che provveder� a far partire "
+#~ "l'installazione\n"
+#~ "vera e propria. Il tempo necessario varia in base al numero di pacchetti\n"
+#~ "che devono essere installati e alla velocit� del vostro hardware, "
+#~ "l'attesa\n"
+#~ "potrebbe anche essere lunga. Una stima del tempo richiesto per finire\n"
+#~ "l'installazione � visibile sullo schermo, in questo modo potrete sapere "
+#~ "se\n"
+#~ "avete tempo a sufficienza per godervi una tazza di caff�.\n"
+#~ "\n"
+#~ "!! Se avete selezionato un pacchetto che offre un servizio come server\n"
+#~ "(intenzionalmente, oppure perch� faceva parte di un gruppo), vi verr�\n"
+#~ "chiesta conferma riguardo una sua effettiva installazione. Come opzione\n"
+#~ "predefinita, in Mandrake Linux tutti i servizi installati vengono "
+#~ "avviati\n"
+#~ "automaticamente al momento del boot. Anche se si tratta di servizi "
+#~ "sicuri\n"
+#~ "al momento in cui � stata rilasciata questa versione della "
+#~ "distribuzione,\n"
+#~ "potrebbe succedere che vengano scoperte delle falle di sicurezza in un\n"
+#~ "momento successivo. Se poi non avete proprio idea di quale sia la "
+#~ "funzione\n"
+#~ "di uno di questi pacchetti, cliccate sul pulsante No. Cliccando su S� i\n"
+#~ "servizi elencati verranno installati e saranno attivati in maniera\n"
+#~ "automatica. !!\n"
+#~ "\n"
+#~ "L'opzione \"Dipendenze automatiche\" disabilita la finestra di dialogo "
+#~ "che\n"
+#~ "compare tutte le volte che il programma di installazione seleziona\n"
+#~ "automaticamente uno o pi� pacchetti. Il programma determina in modo\n"
+#~ "automatico, infatti, quali sono i pacchetti che sono indispensabili a un\n"
+#~ "dato pacchetto (``dipendenze'') perch� quest'ultimo possa essere "
+#~ "installato\n"
+#~ "con successo.\n"
+#~ "\n"
+#~ "Il piccolo dischetto floppy in fondo alla lista vi permette di caricare "
+#~ "la\n"
+#~ "lista di pacchetti scelti durante una precedente installazione. "
+#~ "Cliccando\n"
+#~ "su questa icona vi verr� chiesto di inserire un floppy che avrete creato\n"
+#~ "alla fine di un'altra installazione. Consultate le informazioni che\n"
+#~ "riguardano l'ultimo passo del processo di installazione per sapere come\n"
+#~ "creare questo dischetto."
+
+#~ 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"
+#~ "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 "
+#~ "the\n"
+#~ "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 ""
+#~ "X (per X-Window) � il cuore dell'interfaccia grafica di GNU/Linux, sulla\n"
+#~ "quale sono basati tutti gli ambienti grafici che sono inclusi in "
+#~ "Mandrake\n"
+#~ "Linux (KDE, GNOME, Afterstep, Windowmaker...). In questa sezione, DrakX\n"
+#~ "tenter� di configurare X automaticamente.\n"
+#~ "\n"
+#~ "� molto raro che non abbia successo: l'unico motivo per cui ci� potrebbe\n"
+#~ "accadere � che l'hardware in questione � molto vecchio (o molto "
+#~ "recente).\n"
+#~ "Se l'operazione riesce, DrakX lancer� X automaticamente, con la miglior\n"
+#~ "risoluzione possibile, in base alle dimensioni del monitor. A quel "
+#~ "punto,\n"
+#~ "comparir� una finestra che vi chieder� se potete vederla.\n"
+#~ "\n"
+#~ "Se state effettuando un'installazione in modo Esperto, verr� lanciato\n"
+#~ "l'assistente di configurazione di X. Consultate la sezione del manuale\n"
+#~ "dedicata a questo assistente per avere pi� informazioni al riguardo.\n"
+#~ "\n"
+#~ "Se potete vedere il messaggio e rispondete S�, allora DrakX passer� alla\n"
+#~ "fase successiva. Se non potete vedere il messaggio, significa che la\n"
+#~ "configurazione non andava bene, e il test terminer� automaticamente dopo "
+#~ "10\n"
+#~ "secondi, riportandovi alla schermata precedente."
+
+#~ 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 "
+#~ "graphics\n"
+#~ "card, select Unlisted card, and when prompted on which server you want,\n"
+#~ "choose FBDev. This is a failsafe option which works with any modern\n"
+#~ "graphics card. Then choose Test again to be sure."
+#~ msgstr ""
+#~ "Pu� verificarsi il caso che il primo tentativo non sia quello giusto (lo\n"
+#~ "schermo � troppo piccolo, spostato a destra o a sinistra...). Questo � "
+#~ "il\n"
+#~ "motivo per cui, anche se X viene lanciato correttamente, DrakX vi "
+#~ "chieder�\n"
+#~ "subito dopo se la configurazione va bene, e vi proporr� di cambiarla\n"
+#~ "elencando una lista di modi video validi (in base a quello che ha potuto\n"
+#~ "accertare) chiedendovi di sceglierne uno.\n"
+#~ "\n"
+#~ "Come ultima risorsa, se proprio non riuscite a far funzionare X, "
+#~ "scegliete\n"
+#~ "Cambia scheda grafica, selezionate Unlisted card, e quando vi verr� "
+#~ "chiesto\n"
+#~ "quale server desiderate utilizzare, scegliete FBDev: si tratta di\n"
+#~ "un'opzione a prova d'errore, che funziona con qualsiasi scheda grafica\n"
+#~ "moderna. Quindi scegliete Nuovo test per essere sicuri."
+
+#~ 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 "
+#~ "act\n"
+#~ "as a server, or if you were not successful in getting the display\n"
+#~ "configured."
+#~ msgstr ""
+#~ "Infine DrakX vi chieder� se desiderate utilizzare l'interfaccia grafica "
+#~ "una\n"
+#~ "volta terminato il processo di avvio del sistema. Notate che questa "
+#~ "domanda\n"
+#~ "verr� fatta anche se avete deciso di non provare la configurazione. La\n"
+#~ "scelta pi� ovvia � No se la vostra macchina dovr� svolgere il ruolo di\n"
+#~ "server, o se non siete riusciti a ottenere una configurazione corretta."
+
+#~ 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 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 "
+#~ "Wizard\n"
+#~ "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 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 "
+#~ "partitioning\n"
+#~ "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"
+#~ " * 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"
+#~ " * 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"
+#~ " * Remove Windows: this will simply erase everything on the drive and "
+#~ "begin\n"
+#~ "fresh, partitioning everything from scratch. All data on your disk will "
+#~ "be\n"
+#~ "lost.\n"
+#~ "\n"
+#~ "   !! If you choose this option, all data on your disk will be lost. !!\n"
+#~ "\n"
+#~ " * Expert mode: choose this option if you want to manually partition "
+#~ "your\n"
+#~ "hard drive. Be careful - it is a powerful but dangerous choice. You can\n"
+#~ "very easily lose all your data. Hence, do not choose this unless you "
+#~ "know\n"
+#~ "what you are doing."
+#~ msgstr ""
+#~ "A questo punto dovete scegliere dove installare il vostro sistema "
+#~ "operativo\n"
+#~ "Mandrake Linux sul disco rigido. Se il vostro disco � vuoto, oppure se "
+#~ "un\n"
+#~ "sistema operativo esistente sta usando tutto lo spazio disponibile, "
+#~ "allora\n"
+#~ "dovrete partizionarlo. In breve, partizionare un disco rigido consiste "
+#~ "nel\n"
+#~ "suddividerlo logicamente in maniera da creare lo spazio sufficiente per\n"
+#~ "installare il vostro nuovo sistema operativo Mandrake Linux.\n"
+#~ "\n"
+#~ "Dato che gli effetti del partizionamento sono di solito irreversibili,\n"
+#~ "questa operazione pu� intimidire e rivelarsi stressante per un utente\n"
+#~ "inesperto. Fortunatamente, avete a vostra disposizione un assistente che\n"
+#~ "semplifica questo passo. Prima di iniziare per favore consultate il\n"
+#~ "manuale, e prendete tutto il tempo che vi serve.\n"
+#~ "\n"
+#~ "Se state effettuando l'installazione in modalit� Esperto, verr� lanciato "
+#~ "il\n"
+#~ "programma di gestione e partizionamento dei dischi rigidi di Mandrake\n"
+#~ "Linux, che vi permetter� di configurare accuratamente le vostre "
+#~ "partizioni.\n"
+#~ "Consultate il capitolo relativo a Diskdrake di questo manuale. Potete "
+#~ "usare\n"
+#~ "gli assistenti descritti qui di seguito cliccando sul pulsante "
+#~ "Assistente.\n"
+#~ "\n"
+#~ "Se le partizioni sono gi� stata definite (per una precedente "
+#~ "installazione,\n"
+#~ "o da un'altra utilit� di partizionamento), dovete solo scegliere \n"
+#~ "\"\n"
+#~ "quelle da usare per installare il vostro sistema Linux.\n"
+#~ "\n"
+#~ "Se le partizioni non sono ancora state definite, dovete crearle usando\n"
+#~ "l'assistente. In base alla configurazione del vostro disco rigido, "
+#~ "saranno\n"
+#~ "disponibili diverse soluzioni:\n"
+#~ "\n"
+#~ " * Usa spazio disponibile: questa opzione causer� un partizionamento\n"
+#~ "automatico del vostro disco rigido (o dischi, se ne avete pi� di uno). "
+#~ "Non\n"
+#~ "vi verr� posta nessun'altra domanda.\n"
+#~ "\n"
+#~ " * Usa partizioni esistenti: l'assistente ha trovato una o pi� "
+#~ "partizioni\n"
+#~ "Linux sul vostro disco rigido. Se desiderate usarle scegliete questa\n"
+#~ "opzione.\n"
+#~ "\n"
+#~ " * Usa lo spazio libero nella partizione Windows: se Microsoft Windows �\n"
+#~ "installato sul vostro disco rigido e occupa tutto lo spazio disponibile,\n"
+#~ "dovete creare spazio libero per i dati relativi a Linux. Per farlo "
+#~ "potete\n"
+#~ "cancellare la vostra partizione Microsoft Windows e i dati che contiene\n"
+#~ "(come spiegato in \"Cancella l'intero disco\" o \"Modo Esperto\"), "
+#~ "oppure\n"
+#~ "ridimensionare la vostra partizione Microsoft Windows. Il "
+#~ "ridimensionamento\n"
+#~ "pu� essere effettuato evitando la perdita di dati. Questa � la soluzione\n"
+#~ "raccomandata se desiderate usare sia Mandrake Linux sia Microsoft "
+#~ "Windows\n"
+#~ "sullo stesso computer.\n"
+#~ "\n"
+#~ "   Prima di scegliere questa soluzione, per favore rendetevi conto del "
+#~ "fatto\n"
+#~ "che la dimensione della partizione Microsoft Windows sar� inferiore\n"
+#~ "rispetto a quella attuale. Significa che avrete meno spazio libero sotto\n"
+#~ "Microsoft Windows per archiviare i vostri dati o installare nuovo "
+#~ "software.\n"
+#~ "\n"
+#~ " * Cancella l'intero disco: se desiderate cancellare tutti i dati e tutte "
+#~ "le\n"
+#~ "partizioni presenti sul vostro disco rigido e rimpiazzarli con il vostro\n"
+#~ "nuovo sistema Mandrake Linux, potete selezionare questa opzione. Fate\n"
+#~ "attenzione nello scegliere questa soluzione, dopo la conferma non "
+#~ "potrete\n"
+#~ "tornare indietro.\n"
+#~ "\n"
+#~ "   !! Se scegliete questa opzione, tutti i dati sul vostro disco "
+#~ "andranno\n"
+#~ "persi. !!\n"
+#~ "\n"
+#~ " * Cancella Windows: l'effetto di questa opzione sar� di cancellare "
+#~ "tutto\n"
+#~ "quello che si trova sul disco e di ricominciare da capo, creando le\n"
+#~ "partizioni su un disco vuoto. Tutti i dati presenti sul vostro disco\n"
+#~ "andranno persi.\n"
+#~ "\n"
+#~ "   !! Se scegliete questa opzione, tutti i dati sul vostro disco "
+#~ "andranno\n"
+#~ "persi. !!\n"
+#~ "\n"
+#~ " * Modo Esperto: se volete partizionare manualmente il vostro disco "
+#~ "rigido\n"
+#~ "potete scegliere questa opzione. Fate attenzione prima di optare questa\n"
+#~ "soluzione: � potente, ma molto pericolosa. Potreste facilmente causare "
+#~ "la\n"
+#~ "perdita di tutti i vostri dati. Quindi, non scegliete questa soluzione "
+#~ "se\n"
+#~ "non sapete cosa state facendo."
+
+#~ 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 GNU/"
+#~ "Linux\n"
+#~ "or Windows, whichever you prefer (if you are dual-booting), as soon as "
+#~ "the\n"
+#~ "computer has booted up again.\n"
+#~ "\n"
+#~ "The Advanced button shows two more buttons to:\n"
+#~ "\n"
+#~ " * generate auto-install floppy: to create an installation floppy disk "
+#~ "which\n"
+#~ "will automatically perform a whole installation without the help of an\n"
+#~ "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 "
+#~ "step\n"
+#~ "(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 ""
+#~ "Ecco fatto: l'installazione � terminata, e il vostro sistema GNU/Linux �\n"
+#~ "pronto per essere usato. Dovete soltanto cliccare sul pulsante OK per\n"
+#~ "riavviare il sistema. Potete lanciare GNU/Linux o Windows (se presente),\n"
+#~ "qualunque preferiate dei due, non appena il computer avr� terminato di\n"
+#~ "effettuare il boot.\n"
+#~ "\n"
+#~ "Cliccando sul pulsante Avanzato avrete altri due pulsanti a vostra\n"
+#~ "disposizione:\n"
+#~ "\n"
+#~ " * Crea il floppy di auto installazione: per creare un floppy di\n"
+#~ "installazione che permette di eseguire automaticamente un' installazione\n"
+#~ "completa, del tutto simile a quella che avete appena finito di "
+#~ "configurare,\n"
+#~ "senza che sia necessario l'intervento di un operatore.\n"
+#~ "\n"
+#~ "   Notate che, dopo aver cliccato sul pulsante, saranno disponibili due\n"
+#~ "opzioni diverse:\n"
+#~ "\n"
+#~ "    * Ripeti: questa � un'installazione automatizzata solo in parte, in "
+#~ "quanto\n"
+#~ "la fase di partizionamento del disco (e solo quella) resta interattiva.\n"
+#~ "\n"
+#~ "    * Automatizzata: l'installazione � completamente automatizzata: il "
+#~ "disco\n"
+#~ "rigido viene riscritto per intero, tutti i dati andranno persi.\n"
+#~ "\n"
+#~ "   Questa caratteristica � molto utile quando si deve installare il "
+#~ "sistema su\n"
+#~ "un gran numero di macchine dalle caratteristiche simili. Si veda la "
+#~ "sezione\n"
+#~ "Installazione automatica sul nostro sito web.\n"
+#~ "\n"
+#~ " * Salva scelta pacchetti(*): salva la selezione dei pacchetti effettuata "
+#~ "in\n"
+#~ "precedenza. Al momento di effettuare un'altra installazione, potrete\n"
+#~ "inserire il dischetto nel lettore e installare il sistema richiamando lo\n"
+#~ "schermo di aiuto (premendo F1) e digitando >>linux defcfg=\"floppy\"<<.\n"
+#~ "\n"
+#~ "(*) Sar� necessario un dischetto formattato con il filesystem FAT: per\n"
+#~ "formattarne uno sotto GNU/Linux digitate \"mformat a:\""
 
-#~ msgid "GB"
-#~ msgstr "Gb"
+#~ 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 reformat "
+#~ "partitions\n"
+#~ "containing data that you wish to keep (typically /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"
+#~ "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 "
+#~ "for\n"
+#~ "bad blocks on the disc."
+#~ msgstr ""
+#~ "Qualsiasi partizione appena definita deve essere formattata prima di "
+#~ "poter\n"
+#~ "essere usata (formattare significa creare un filesystem).\n"
+#~ "\n"
+#~ "A questo punto, potreste voler riformattare alcune partizioni "
+#~ "preesistenti\n"
+#~ "per cancellare i dati che contengono. Se desiderate farlo, per favore\n"
+#~ "scegliete le partizioni che intendete formattare.\n"
+#~ "\n"
+#~ "Per favore notate che non � necessario riformattare tutte le partizioni\n"
+#~ "preesistenti. Dovete riformattare le partizioni che contengono il "
+#~ "sistema\n"
+#~ "operativo (come /, /usr o /var), ma potete non riformattare partizioni "
+#~ "che\n"
+#~ "contengono dati che desiderate conservare (tipicamente /home).\n"
+#~ "\n"
+#~ "Per favore fate attenzione nella scelta delle partizioni, dopo la\n"
+#~ "formattazione tutti i dati saranno cancellati e non potrete recuperarli.\n"
+#~ "\n"
+#~ "Cliccate su OK quando sarete pronti a formattare le partizioni.\n"
+#~ "\n"
+#~ "Cliccate su Annulla se desiderate scegliere altre partizioni sulle quali\n"
+#~ "installare il vostro nuovo sistema operativo Mandrake Linux.\n"
+#~ "\n"
+#~ "Cliccate su Avanzato se desiderate che le partizioni selezionate vengano\n"
+#~ "controllate per accertare la presenza di eventuali blocchi rovinati."
 
-#~ msgid "KB"
-#~ msgstr "Kb"
+#~ 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 ""
+#~ "Prima di proseguire dovreste leggere con attenzione le condizioni d'uso:\n"
+#~ "queste riguardano l'intera distribuzione Mandrake Linux, e se non siete\n"
+#~ "d'accordo con qualche punto della licenza cliccate sul pulsante Rifiuto.\n"
+#~ "Questo interromper� immediatamente il processo di installazione. Per\n"
+#~ "proseguire con l'installazione, cliccate sul pulsante Accetto."
 
-#~ msgid "TB"
-#~ msgstr "Tb"
+#~ msgid ""
+#~ "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 ""
+#~ "Anche in questo caso DrakX avr� individuato la tastiera corretta (in "
+#~ "base\n"
+#~ "alla lingua che avete scelto) e voi non avrete nemmeno visto questo "
+#~ "punto\n"
+#~ "dell'installazione. Tuttavia, potreste avere una tastiera che non\n"
+#~ "corrisponde esattamente alla vostra lingua: se siete un francese che "
+#~ "parla\n"
+#~ "italiano, ad esempio, potreste avere bisogno di una tastiera francese.\n"
+#~ "Oppure, se parlate italiano ma vivete nel Qu�bec, vi troverete nella "
+#~ "stessa\n"
+#~ "situazione. In entrambi i casi, dovrete tornare a questa fase\n"
+#~ "dell'installazione e selezionare una tastiera dalla lista.\n"
+#~ "\n"
+#~ "Cliccate sul pulsante Avanzato per avere una lista completa delle "
+#~ "tastiere\n"
+#~ "supportate."
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minuti"
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage.\n"
+#~ "\n"
+#~ "Clicking on the Advanced button will allow you to select other languages "
+#~ "to\n"
+#~ "be installed on your workstation. Selecting other languages will install\n"
+#~ "the language-specific files for system documentation and applications. "
+#~ "For\n"
+#~ "example, if you will host users from Spain on your machine, select "
+#~ "English\n"
+#~ "as the main language in the tree view and in the Advanced section click "
+#~ "on\n"
+#~ "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 ""
+#~ "Per favore scegliete la lingua che intendete usare per l'installazione e\n"
+#~ "l'uso del sistema.\n"
+#~ "\n"
+#~ "Cliccando sul pulsante Avanzato potrete scegliere altre lingue da\n"
+#~ "installare sul vostro computer. La selezione di altre lingue comporta\n"
+#~ "l'installazione dei file relativi alla documentazione e alle "
+#~ "applicazioni\n"
+#~ "per ciascuna di esse. Se il vostro computer, ad esempio, verr� usato da\n"
+#~ "persone di madre lingua spagnola, potete scegliere l'italiano come "
+#~ "lingua\n"
+#~ "principale nella struttura ad albero e, nella sezione Avanzato, apporre "
+#~ "un\n"
+#~ "segno di spunta sul pulsante grigio corrispondente a \"Spanish|Spain\".\n"
+#~ "\n"
+#~ "Notate che � possibile installare file relativi a pi� lingue. Dopo aver\n"
+#~ "scelto quelle che preferite cliccate sul pulsante OK per continuare."
 
-#~ msgid "1 minute"
-#~ msgstr "1 minuto"
+#~ 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 "
+#~ "do\n"
+#~ "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 "
+#~ "easy\n"
+#~ "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"
+#~ "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"
+#~ "If your network uses LDAP (or NIS) protocol for authentication, select "
+#~ "LDAP\n"
+#~ "(or NIS) as authentication. If you do not know, ask your network\n"
+#~ "administrator.\n"
+#~ "\n"
+#~ "If your computer is not connected to any administrated network, you will\n"
+#~ "want to choose Local files for authentication."
+#~ msgstr ""
+#~ "Questo � il punto pi� critico per la sicurezza del vostro sistema\n"
+#~ "GNU/Linux: state per decidere la password di root. root � "
+#~ "l'amministratore\n"
+#~ "del sistema, ed � l'unico utente autorizzato a compiere aggiornamenti,\n"
+#~ "aggiungere altri utenti, cambiare la configurazione globale del sistema,\n"
+#~ "etc. In breve, pu� fare tutto ci� che vuole! Questo � il motivo per cui\n"
+#~ "dovete scegliere una password che sia difficile da indovinare: DrakX vi\n"
+#~ "dir� se � troppo facile. Come si pu� vedere, potete scegliere di non\n"
+#~ "digitare una password, ma noi vi consigliamo caldamente di farlo. A "
+#~ "parte\n"
+#~ "ogni altro motivo, considerate questo fatto: non pensate che, poich� "
+#~ "avete\n"
+#~ "effettuato il boot con GNU/Linux, gli altri sistemi operativi che "
+#~ "convivono\n"
+#~ "con esso sulla stessa macchina siano al sicuro da errori. Al contrario:\n"
+#~ "root pu� scavalcare ogni limitazione e (involontariamente) cancellare "
+#~ "tutti\n"
+#~ "i dati presenti sulle partizioni accedendo in maniera scorretta a queste\n"
+#~ "ultime! Quindi � molto importante che sia difficile per gli utenti "
+#~ "normali\n"
+#~ "diventare root.\n"
+#~ "\n"
+#~ "La password ideale � costituita da un insieme di caratteri alfanumerici\n"
+#~ "lungo almeno 8 caratteri. Non scrivete mai su qualche appunto la "
+#~ "password\n"
+#~ "di root, renderebbe troppo facile accedere al sistema.\n"
+#~ "\n"
+#~ "Prestate attenzione, tuttavia, a non scegliere una password troppo lunga "
+#~ "o\n"
+#~ "complicata, perch� dovete essere in grado di ricordarla senza troppo\n"
+#~ "sforzo.\n"
+#~ "\n"
+#~ "La password non verr� mostrata mentre la digitate. Per questo motivo �\n"
+#~ "necessario che venga inserita due volte, per ridurre il rischio di un\n"
+#~ "errore di battitura. Se per caso commettete lo stesso errore due volte,\n"
+#~ "questa password \"scorretta\" sar� quella che verr� richiesta la prima\n"
+#~ "volta che vi connetterete al sistema.\n"
+#~ "\n"
+#~ "In modo esperto vi verr� chiesto se il vostro computer � connesso a un\n"
+#~ "server di autenticazione, secondo il protocollo NIS o LDAP.\n"
+#~ "\n"
+#~ "Se la vostra rete si basa sul protocollo LDAP (o NIS) per "
+#~ "l'autenticazione,\n"
+#~ "selezionate il pulsante LDAP (o NIS) per effettuare l'autenticazione. Se\n"
+#~ "non siete sicuri, chiedete al vostro amministratore di rete.\n"
+#~ "\n"
+#~ "Se il vostro computer non � connesso a una rete soggetta ad "
+#~ "autenticazione,\n"
+#~ "scegliete File locali."
 
-#~ msgid "%d seconds"
-#~ msgstr "%d secondi"
+#~ 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 "
+#~ "if\n"
+#~ "you know that there is a SCSI card installed in your machine. You will "
+#~ "be\n"
+#~ "presented a list of SCSI cards to choose from. Click No if you have no "
+#~ "SCSI\n"
+#~ "hardware. If you are unsure you can check the list of hardware detected "
+#~ "in\n"
+#~ "your machine by selecting \"See hardware info\" and clicking OK. Examine\n"
+#~ "the list of hardware and then click on the OK button to return to the "
+#~ "SCSI\n"
+#~ "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 ""
+#~ "A questo punto, DrakX proseguir� con il rilevamento di tutti i dischi\n"
+#~ "rigidi e altri dispositivi IDE presenti sul vostro computer. Cercher� "
+#~ "anche\n"
+#~ "di stabilire se sul vostro sistema � presente una o pi� schede SCSI di "
+#~ "tipo\n"
+#~ "PCI. Se verr� individuato un dispositivo di questo tipo, DrakX "
+#~ "installer�\n"
+#~ "automaticamente il driver relativo.\n"
+#~ "\n"
+#~ "Dato che il riconoscimento automatico in alcuni casi potrebbe non "
+#~ "riuscire\n"
+#~ "a individuare un dispositivo hardware, vi verr� comunque chiesto se "
+#~ "avete\n"
+#~ "una scheda SCSI PCI o no. Cliccate su S� se siete sicuri che nel vostro\n"
+#~ "computer � presente una scheda SCSI: potrete scegliere la vostra scheda "
+#~ "da\n"
+#~ "una lista. Cliccate su No se non disponete di nessun tipo di hardware "
+#~ "SCSI.\n"
+#~ "Se non siete sicuri, potete anche controllare la lista dell'hardware\n"
+#~ "rilevato nella vostra macchina selezionando \"Vedi informazioni hardware"
+#~ "\"\n"
+#~ "e cliccando su OK. Controllate la lista relativa all'hardware individuato "
+#~ "e\n"
+#~ "poi cliccate sul pulsante OK per ritornare alla domanda relativa alla\n"
+#~ "scheda SCSI.\n"
+#~ "\n"
+#~ "Se sarete costretti a specificare manualmente il tipo di adattatore in\n"
+#~ "vostro possesso, DrakX vi chieder� se intendete indicare delle opzioni\n"
+#~ "relative ad esso. Vi consigliamo di permettere a DrakX di interrogare\n"
+#~ "l'hardware per stabilire le opzioni specifiche per quella scheda che\n"
+#~ "dovranno essere inizializzate. In genere questo metodo offre buoni\n"
+#~ "risultati.\n"
+#~ "\n"
+#~ "Se DrakX non riesce a stabilire quali sono le opzioni da passare alla\n"
+#~ "scheda, dovrete specificarle manualmente. Per favore consultate il\n"
+#~ "``Manuale dell'utente'' (capitolo 3, paragrafo \"Ricerca di informazioni\n"
+#~ "sul vostro hardware\") per qualche suggerimento su come recuperare i\n"
+#~ "parametri richiesti dalla documentazione dell'hardware, dal sito web del\n"
+#~ "produttore (se disponete di un accesso a Internet) oppure da Microsoft\n"
+#~ "Windows (se avete utilizzato quest'hardware sul vostro sistema con\n"
+#~ "Windows)."
+
+#~ msgid ""
+#~ "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 order "
+#~ "to\n"
+#~ "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 ""
+#~ "Qui sono riportati vari parametri relativi alla vostra macchina. In base\n"
+#~ "all'hardware installato sulla vostra macchina potrete vedere (oppure no) "
+#~ "le\n"
+#~ "voci che seguono:\n"
+#~ "\n"
+#~ " * \"Mouse\": mouse controllate la configurazione attuale del mouse, e\n"
+#~ "cliccate sul pulsante per cambiarla, se necessario.\n"
+#~ "\n"
+#~ " * \"Tastiera\": tastiera controllate l'attuale mappa della tastiera, e\n"
+#~ "cliccate sul pulsante per cambiarla, se necessario.\n"
+#~ "\n"
+#~ " * \"Fuso orario\": fuso orarioDrakX, come opzione predefinita, deduce "
+#~ "il\n"
+#~ "vostro fuso orario dalla lingua che avete scelto. Ma anche in questo "
+#~ "caso,\n"
+#~ "come per la scelta della tastiera, potreste non trovarvi nella nazione "
+#~ "cui\n"
+#~ "corrisponde la lingua che avete scelto, in tal caso sar� necessario\n"
+#~ "cliccare su questo pulsante per poter configurare il fuso orario in base "
+#~ "a\n"
+#~ "quello dell'area geografica in cui vivete.\n"
+#~ "\n"
+#~ " * \"Stampante\": cliccando sul pulsante Nessuna stampante si richiamer�\n"
+#~ "l'assistente di configurazione della stampante.\n"
+#~ "\n"
+#~ " * \"Scheda audio\": se sul vostro sistema � stata individuata una "
+#~ "scheda\n"
+#~ "audio, verr� mostrata qui. Al momento dell'installazione non � possibile\n"
+#~ "apportare alcuna modifica.\n"
+#~ "\n"
+#~ " * \"Scheda TV\": se sul vostro sistema � stata individuata una scheda "
+#~ "TV,\n"
+#~ "verr� mostrata qui. Al momento dell'installazione non � possibile "
+#~ "apportare\n"
+#~ "alcuna modifica.\n"
+#~ "\n"
+#~ " * \"Scheda ISDN\": se sul vostro sistema � stata individuata una scheda\n"
+#~ "ISDN, verr� mostrata qui. Potete cliccare sul pulsante relativo per\n"
+#~ "cambiare i suoi parametri."
+
+#, fuzzy
+#~ msgid ""
+#~ "You may now choose which services you want to start at boot time.\n"
+#~ "\n"
+#~ "Here are presented all the services available with the current "
+#~ "installation.\n"
+#~ "Review them carefully and uncheck those that are not always needed at "
+#~ "boot time.\n"
+#~ "\n"
+#~ "You can get a short explanatory text on a service by placing the mouse "
+#~ "cursor on\n"
+#~ "the service name. If you are not sure whether a service is useful or not, "
+#~ "it is\n"
+#~ "safer to leave the default behavior though.\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 ""
+#~ "Ora puoi scegliere i servizi che devono essere avviati al momento del "
+#~ "boot.\n"
+#~ "\n"
+#~ "\n"
+#~ "Quando il tuo mouse passa sopra un oggetto, apparir� un piccolo testo di "
+#~ "aiuto\n"
+#~ "che descrive la funzione del servizio.\n"
+#~ "\n"
+#~ "\n"
+#~ "Presta particolare attenzione a questa fase se intendi usare la tua "
+#~ "macchina\n"
+#~ "come server: probabilmente non vorrai avviare alcun servizio di cui non\n"
+#~ "hai bisogno. Ricorda che numerosi servizi possono essere pericolosi\n"
+#~ "se attivati su un server. Come regola generale, seleziona solo i servizi "
+#~ "di cui hai davvero bisogno."
+
+#~ msgid ""
+#~ "Your new Mandrake Linux operating system is currently being installed. "
+#~ "This\n"
+#~ "operation should take a few minutes (it depends on size you choose to "
+#~ "install\n"
+#~ "and the speed of your computer).\n"
+#~ "\n"
+#~ "Please be patient."
+#~ msgstr ""
+#~ "Il tuo nuovo sistema operativo Mandrake Linux � in fase\n"
+#~ "di installazione. Questa operazione dovrebbe richiedere alcuni minuti "
+#~ "(dipende\n"
+#~ "dalla dimensione che hai scelto di installare e dalla velocit� del tuo "
+#~ "computer).\n"
+#~ "\n"
+#~ "\n"
+#~ "Per favore pazienta."
+
+#~ msgid "Spooler: "
+#~ msgstr "Spooler: "
+
+#~ msgid "Test the mouse here."
+#~ msgstr "Prova il mouse qui."
+
+#~ msgid "Press next to continue."
+#~ msgstr "Premi avanti per continuare"
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr ""
+#~ "Seleziona la lingua desiderata per l'installazione e l'uso 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 ""
+#~ "Devi accettare i termini della licenza qui sopra per continuare "
+#~ "l'installazione.\n"
+#~ "\n"
+#~ "\n"
+#~ "Per favore clicca su \"Accetta\" se sei d'accordo con i suoi termini.\n"
+#~ "\n"
+#~ "\n"
+#~ "Per favore clicca su \"Rifiuta\" se non sei d'accordo con i suoi "
+#~ "termini.\n"
+#~ "L'installazione finir� senza modificare la configurazione corrente."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Scegli l'impostazione della tua tastiera dalla lista qui sopra"
+
+#~ 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 ""
+#~ "Se lo desideri, altre lingue (oltre a quella da te scelto all'inizio\n"
+#~ "dell'installazione) saranno disponibili dopo l'installazione, per favore\n"
+#~ "sceglile dalla lista qui sopra. Se vuoi sceglierle tutte, devi solo\n"
+#~ "selezionare \"Tutte\"."
+
+#~ 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 ""
+#~ "Seleziona:\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Personalizzata: sei hai familiarit� con GNU/Linux, sarai in grado "
+#~ "di \n"
+#~ "scegliere l'utilizzo normale del tuo computer. Vedi pi� avanti per \n"
+#~ "ulteriori dettagli.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Esperto: se conosci bene GNU/Linux e vuoi effettuare una "
+#~ "installazione\n"
+#~ "altamente personalizzata, questa classe d'installazione � per te. Sarai "
+#~ "in\n"
+#~ "grado di scegliere l'utilizzo del tuo sistema installato come per \n"
+#~ "\"Personalizzata\"."
+
+#~ 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 ""
+#~ "Adesso devi indicare l'uso principale per questa macchina. Puoi scegliere "
+#~ "tra:\n"
+#~ "\n"
+#~ "* Workstation: la scelta ideale se intendi usare questo computer "
+#~ "principalmente per\n"
+#~ "  l'uso di ogni giorno, in ufficio o a casa.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Sviluppatore: se intendi usare la tua macchina soprattutto per lo "
+#~ "sviluppo di software, questa �\n"
+#~ "  una buona scelta. Verr� installata una raccolta completa del software "
+#~ "necessario a formattare, compilare ed effettuare\n"
+#~ "  il debug del tuo codice sorgente, come pure per creare pacchetti "
+#~ "software.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Server: la scelta migliore se intendi usare questa macchina come "
+#~ "server. Pu� trattarsi di un server\n"
+#~ "  di file (NFS o SMB), un server di stampa (in stile Unix o Windows),\n"
+#~ "  un server di autentificazione (NIS), un server di database, e cos� "
+#~ "via.\n"
+#~ "  Trattandosi di un server, non aspettarti che vengano installati "
+#~ "fronzoli di vario tipo (KDE, 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 ""
+#~ "Ora puoi scegliere il gruppo di pacchetti che vuoi installare o "
+#~ "aggiornare.\n"
+#~ "\n"
+#~ "Quindi DrakX controller� se hai abbastanza spazio per installarli tutti. "
+#~ "In \n"
+#~ "caso negativo, ti avvertir�. Se vuoi continuare lo stesso, proceder� "
+#~ "alla\n"
+#~ "installazione dei gruppi selezionati, ma tralascer� alcuni pacchetti di "
+#~ "minore\n"
+#~ "interesse. Alla fine della lista puoi scegliere l'opzione\n"
+#~ "\"Selezione individuale pacchetti\"; in questo caso dovrai sfogliare una "
+#~ "lista\n"
+#~ "di pi� di 1000 pacchetti..."
+
+#~ 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 ""
+#~ "Puoi ora scegliere individualmente tutti i pacchetti\n"
+#~ "che desideri installare.\n"
+#~ "\n"
+#~ "\n"
+#~ "Puoi espandere o raggruppare la struttura cliccando sulle opzioni "
+#~ "nell'angolo\n"
+#~ "a sinistra della finestra dei pacchetti.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se preferisci vedere i pacchetti ordinati alfabeticamente, clicca sulla\n"
+#~ "icona \"Cambia ordinamento semplice o a gruppi\".\n"
+#~ "\n"
+#~ "Se non vuoi essere avvertito per le dipendenze, clicca su \"Dipendenze\n"
+#~ "in automatico\". Se lo fai, nota che deselezionare un pacchetto potrebbe\n"
+#~ "silenziosamente deselezionare alcuni altri pacchetti che da esso "
+#~ "dipendono."
+
+#~ 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 ""
+#~ "Se hai tutti i CD elencati nella lista qui sopra, clicca Ok.\n"
+#~ "Se non hai nessuno di quei CD, clicca Cancel.\n"
+#~ "Se mancano solo alcuni CDs, deselezionali, e clicca Ok."
+
+#~ 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 ""
+#~ "Adesso puoi provare il tuo mouse. Usa i pulsanti e la ruotina per "
+#~ "verificare\n"
+#~ "l'esattezza delle impostazioni. Se non vanno bene, clicca su \"Cancel\" "
+#~ "per\n"
+#~ "scegliere un altro driver.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se stai effettuando l'installazione su un computer Apple con mouse a un "
+#~ "pulsante,\n"
+#~ "avrai la possibilit� di specificare dei tasti per emulare il secondo e il "
+#~ "terzo\n"
+#~ "pulsante del mouse. Questo ti permetter� di godere di una completa "
+#~ "funzionalit�\n"
+#~ "del mouse sia nella console di Linux sia nella GUI di X Window.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se possiedi un mouse ADB, per favore scegli USB, e il kernel si prender� "
+#~ "cura\n"
+#~ "di configurare correttamente l'hardware del mouse."
+
+#~ 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 ""
+#~ "Se desideri connettere il tuo computer a Internet o\n"
+#~ "a una rete locale, per favore scegli l'opzione corretta. Per favore "
+#~ "accendi\n"
+#~ "il tuo dispositivo prima di scegliere l'opzione corretta per permettere\n"
+#~ "a DrakX di individuarlo automaticamente.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se non hai alcuna connessione ad Internet o a una rete locale, scegli\n"
+#~ "\"Disabilita rete\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Se desideri configurare la rete pi� tardi dopo l'installazione, o se hai\n"
+#~ "finito di configurare la tua connessione di rete, scegli \"Fatto\"."
+
+#~ 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 ""
+#~ "Nessun modem individuato. Per favore seleziona la porta seriale a cui � "
+#~ "connesso.\n"
+#~ "\n"
+#~ "\n"
+#~ "Per tua informazione, la prima porta seriale (chiamata \"COM1\" sotto MS\n"
+#~ "Windows) � chiamata \"ttyS0\" sotto 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 ""
+#~ "Ora puoi inserire le opzioni di chiamata. Se non le sai o\n"
+#~ "non sei sicuro di cosa inserire, le informazioni esatte possono essere\n"
+#~ "ottenute dal tuo Internet Service Provider. Se non immetti "
+#~ "l'informazione\n"
+#~ "DNS (nome server) qui, sar� ottenuta dal tuo Internet Service Provider\n"
+#~ "in fase di connessione."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Se il tuo modem � esterno, per favore accendilo e lascia che DrakX lo "
+#~ "riconosca in automatico."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Per favore accendi il tuo modem e scegli quello corretto."
+
+#~ 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 ""
+#~ "Se non sei sicuro che le informazioni qui sopra\n"
+#~ "siano corrette, o se non sai o sei sicuro di cosa immettere, le "
+#~ "informazioni\n"
+#~ "corrette possono essere ottenute dal tuo Internet Service Provider. Se "
+#~ "non\n"
+#~ "inserisci l'informazione DNS (server dei nomi) qui, verr� ottenuta dal "
+#~ "tuo \n"
+#~ "Internet Service Provider in fase di connessione."
+
+#~ 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 ""
+#~ "Adesso puoi inserire il nome del tuo host se necessario. Se non sei "
+#~ "sicuro di cosa\n"
+#~ "inserire, le informazioni corrette possono essere reperite presso il tuo "
+#~ "ISP (Internet Service Provider)."
+
+#~ 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 ""
+#~ "Adesso puoi configurare il dispositivo di rete.\n"
+#~ "\n"
+#~ "   * Indirizzo IP: se non lo conosci o non sei sicuro, chiedi al tuo "
+#~ "amministratore di rete.\n"
+#~ "     Se pi� avanti scegli l'opzione \"IP automatico\", non dovresti "
+#~ "inserire un indirizzo IP qui.\n"
+#~ "\n"
+#~ "   * Netmask: \"255.255.255.0\" � generalmente una buona scelta. Se non "
+#~ "sei\n"
+#~ "sicuro, chiedi all'amministratore di rete.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * IP automatico: se la tua rete usa i protocolli BOOTP o DHCP, "
+#~ "scegli \n"
+#~ "questa opzione. Se selezionata, nessun valore � necessario in \"indirizzo "
+#~ "IP\".\n"
+#~ "Se non sei sicuro, o non sai se � necessario attivare questa opzione, "
+#~ "chiedi al tuo amministratore di rete."
+
+#~ 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 ""
+#~ "Adesso puoi inserire il nome del tuo host se necessario. Se non\n"
+#~ "lo sai o non sei sicuro, chiedi al tuo amministratore di rete."
+
+#~ 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 ""
+#~ "Adesso puoi inserire il nome del tuo host se necessario. Se non\n"
+#~ "lo sai o non sei sicuro, lascia in bianco."
+
+#~ 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 ""
+#~ "Puoi ora inserire le opzioni di connessione. Se non sei sicuro di cosa\n"
+#~ "inserire, le informazioni corrette possono essere reperite presso il tuo "
+#~ "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 ""
+#~ "Se userai dei proxy, per favore configurali ora. Se non sai se userai\n"
+#~ "dei proxy, chiedi al tuo amministratore di rete o all'ISP."
+
+#~ 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 ""
+#~ "Puoi installare i pacchetti di crittografia, se la tua connessione "
+#~ "Internet\n"
+#~ "� stata configurata correttamente. Per prima cosa scegli un mirror da cui "
+#~ "scaricare\n"
+#~ "i pacchetti, e poi scegli i pacchetti da installare.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nota che devi scegliere mirror e pacchetti di crittografia in conformit� "
+#~ "con\n"
+#~ "quanto previsto dalla tua legislazione."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "Puoi ora scegliere il tuo fuso orario in base a dove vivi."
+
+#~ 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 ""
+#~ "Puoi configurare una stampante locale (connessa al tuo computer) o una\n"
+#~ "remota (accessibile via una rete 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 ""
+#~ "Se desideri essere in grado di stampare, per favore scegli uno dei due\n"
+#~ "sistemi di stampa, CUPS o LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS � un sistema di stampa per sistemi Unix nuovo, potente e flessibile "
+#~ "(CUPS\n"
+#~ "significa \"Common Unix Printing System\"). � il sistema predefinito in\n"
+#~ "Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR � il vecchio sistema di stampa usato in precedenti distribuzioni "
+#~ "Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se non hai una stampante, clicca su \"Nessuno\"."
+
+#~ 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 pu� gestire molti tipi di stampanti. Ognuno di essi richiede "
+#~ "un\n"
+#~ "differente settaggio.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se la tua stampante � fisicamente connessa al computer, scegli \n"
+#~ "\"Stampante locale\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Se vuoi accedere a una stampante che si trova su una macchina remota "
+#~ "Microsoft\n"
+#~ "Windows (o una macchina Unix che usa il protocollo SMB), scegli\n"
+#~ "\"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 ""
+#~ "Per favore, accendi la tua stampante prima di continuare per permettere a "
+#~ "DrakX\n"
+#~ "di identificarla.\n"
+#~ "\n"
+#~ "Qui devi inserire alcune informazioni.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Nome stampante: lo spooler di stampa usa \"lp\" come nome "
+#~ "predefinito. Perci� devi avere una stampante chiamata \"lp\".\n"
+#~ "     Se hai solo una stampante, puoi assegnarle diversi nomi. Devi solo "
+#~ "separarli con un carattere pipe\n"
+#~ "     (un \"|\"). Cos�, se preferisci un nome pi� significativo, devi "
+#~ "metterlo per primo, es: \"Mia Stampante|lp\".\n"
+#~ "     La stampante che ha \"lp\" nel(i) nome(i) sar� quella predefinita.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Descrizione: � opzionale, ma pu� essere utile se hai diverse "
+#~ "stampanti connesse al tuo computer o se permetti ad\n"
+#~ "     altri computers di accedere a questa stampante.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Posizione: se vuoi inserire qualche informazione su dove\n"
+#~ "si trova la tua stampante, mettila qui (sei libero di scrivere ci�\n"
+#~ "     che vuoi, per esempio \"2ndo piano\").\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 ""
+#~ "Qui devi inserire alcune informazioni.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Nome della coda: lo spooler di stampa usa \"lp\" come nome "
+#~ "predefinito. Perci� devi avere una stampante chiamata \"lp\".\n"
+#~ "     Se hai solo una stampante, puoi assegnarle diversi nomi. Devi solo "
+#~ "separarli con un carattere pipe\n"
+#~ "     (un \"|\"). Cos�, se preferisci un nome pi� significativo, devi "
+#~ "metterlo per primo, es: \"Mia Stampante|lp\".\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * Directory di spool: � la directory in cui sono immagazzinati i "
+#~ "lavori di stampa. Mantieni le\n"
+#~ "impostazioni predefinite se non sai cosa usare\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Connessione Stampante: se la tua stampante � fisicamente connessa al "
+#~ "tuo computer, scegli \"Stampante locale\".\n"
+#~ "     Se vuoi accedere ad una stampante che si trova su una macchina Unix "
+#~ "remota, scegli \"Stampante lpd remota\".\n"
+#~ "\n"
+#~ "\n"
+#~ "    Se vuoi accedere a una stampante che si trova su una macchina "
+#~ "Microsoft Windows remota (o su una Unix che\n"
+#~ "    usa il protocollo SMB), scegli \"SMB/Windows95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "    Se vuoi accedere a una stampante che fa parte di una rete NetWare, "
+#~ "scegli \"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 ""
+#~ "La tua stampante non � stata individuata. Per favore, inserisci il nome "
+#~ "del\n"
+#~ "dispositivo al quale � connessa.\n"
+#~ "\n"
+#~ "\n"
+#~ "Per tua informazione, la maggior parte delle stampanti � connessa alla "
+#~ "prima porta\n"
+#~ "parallela. � chiamata \"/dev/lp0\" sotto GNU/Linux e \"LPT1\" sotto "
+#~ "Microsoft\n"
+#~ "Windows."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Ora puoi scegliere la tua stampante dalla lista qui sopra."
+
+#~ 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 ""
+#~ "Per favore seleziona le opzioni corrette per la tua stampante.\n"
+#~ "Se non sai cosa scegliere, consulta la sua documentazione.\n"
+#~ "\n"
+#~ "\n"
+#~ "Potrai provare la tua configurazione nella prossima fase e sarai in "
+#~ "grado\n"
+#~ "di modificarla se non funziona come vuoi."
+
+#~ 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 ""
+#~ "Ora puoi inserire la password di root per il tuo sistema Mandrake Linux.\n"
+#~ "La password deve essere digitata due volte per verificare che\n"
+#~ "entrambi gli inserimenti siano uguali.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root � l'amministratore del sistema, ed � l'unico utente\n"
+#~ "abilitato alla modifica della configurazione del sistema. Perci�, scegli\n"
+#~ "la password attentamente! L'uso non autorizzato dell'account root pu�\n"
+#~ "essere estremamente pericoloso per l'integrit� del sistema, i dati che\n"
+#~ "contiene, e altri sistemi cui � connesso. La password dovrebbe essere un\n"
+#~ "insieme di caratteri alfanumerici, e lunga almeno 8 caratteri. Non\n"
+#~ "dovrebbe *mai* essere scritta su carta. Non creare una password troppo "
+#~ "lunga\n"
+#~ "o complicata, ad ogni modo: devi essere in grado di ricordarla senza "
+#~ "troppo\n"
+#~ "sforzo."
+
+#~ 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 ""
+#~ "Se la tua rete usa il protocollo LDAP (o NIS) per l'autenticazione, "
+#~ "scegli\n"
+#~ "\"LDAP\" (o \"NIS\") come autenticazione. Se non sei sicuro, chiedi al "
+#~ "tuo amministratore\n"
+#~ "di rete.\n"
+#~ "\n"
+#~ "Se il tuo computer non � connesso a reti con autenticazione, potresti "
+#~ "preferire la\n"
+#~ "scelta di \"File locali\" per l'autenticazione."
+
+#~ 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 ""
+#~ "Ora puoi creare uno o pi� account per utenti \"normali\", come "
+#~ "controparte\n"
+#~ "dell'account dell'utente \"privilegiato\", root. Puoi creare uno o pi�\n"
+#~ "account per ogni persona cui vuoi permettere di usare il computer.\n"
+#~ "Nota che ogni utente avr� le sue proprie preferenze (ambiente\n"
+#~ "grafico, impostazioni dei programmi, etc.) e la sua \"directory home\" "
+#~ "in\n"
+#~ "cui sono archiviate queste preferenze.\n"
+#~ "\n"
+#~ "\n"
+#~ "Prima di tutto, crea un account per te stesso! Anche se sarai l'unico "
+#~ "utente\n"
+#~ "della macchina, NON dovresti connetterti come root per uso giornaliero "
+#~ "del sistema: � un\n"
+#~ "alto rischio per la sicurezza. Rendere il sistema inutilizzabile � molto "
+#~ "spesso questione di un solo tasto sbagliato.\n"
+#~ "\n"
+#~ "\n"
+#~ "Perci� dovresti connetterti al sistema usando l'accesso utente che avrai\n"
+#~ "creato qui, e fare il login come root solo per scopi di amministrazione\n"
+#~ "e manutenzione."
+
+#~ 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 ""
+#~ "� fortemente consigliato creare un disco di avvio. Se non puoi\n"
+#~ "avviare il tuo computer, � l'unico modo per recuperarlo senza doverlo\n"
+#~ "reinstallare."
+
+#~ 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 ""
+#~ "Le opzioni principali di LILO e grub sono:\n"
+#~ "  - Boot device: specifica il nome del dispositivo (es. una partizione\n"
+#~ "del disco rigido) che contiene il settore di boot. A meno che tu non sia "
+#~ "sicuro di un'impostazione diversa, scegli \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Ritardo prima di caricare l'immagine di default: specifica il tempo "
+#~ "(in\n"
+#~ "decimi di secondo) che il boot loader deve attendere prima di caricare "
+#~ "la \n"
+#~ "prima immagine.\n"
+#~ "� utile su sistemi che effettuano subito il boot dal disco rigido dopo "
+#~ "avere\n"
+#~ "abilitato la tastiera. Il boot loader non aspetta se \"ritardo\" � "
+#~ "omesso\n"
+#~ "o se � fissato a zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Modo Video: specifica il modo testo VGA che dovrebbe essere "
+#~ "selezionato\n"
+#~ "al momento del boot. Sono disponibili i valori seguenti: \n"
+#~ "\n"
+#~ "    * normale: seleziona il normale modo testo 80x25.\n"
+#~ "\n"
+#~ "    * <numero>: usa il modo testo corrispondente.\n"
+#~ "\n"
+#~ "  - Pulisci \"/tmp\" ad ogni boot: se vuoi cancellare tutti i file e le "
+#~ "directory\n"
+#~ "contenute in \"/tmp\" all'avvio del sistema selezionate questa opzione.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Precisa RAM se necessario: sfortunatamente non esiste un metodo "
+#~ "standard per\n"
+#~ "interrogare il BIOS riguardo la quantit� di RAM presente. Di conseguenza, "
+#~ "Linux pu�\n"
+#~ "fallire nel tentare di determinare tale quantit�. In tal caso puoi\n"
+#~ "specificare qui la cifra corretta. Nota che una differenza di 2 or 4\n"
+#~ "Mb tra memoria individuata e memoria presente nel sistema � normale."
+
+#~ 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 ""
+#~ "Le opzioni principali di SILO sono:\n"
+#~ "  - Installazione bootloader: Indica dove vuoi posizionare le "
+#~ "informazioni\n"
+#~ "richieste per avviare GNU/Linux. A meno che tu non sappia esattamente "
+#~ "cosa\n"
+#~ "stai facendo, scegli \"Primo settore del drive (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Ritardo prima di caricare l'immagine di default: Specifica il tempo "
+#~ "in\n"
+#~ "decimi di secondo che il boot loader deve attendere prima di caricare "
+#~ "la \n"
+#~ "prima immagine.\n"
+#~ "� utile su sistemi che caricano immediatamente dall'hard disk dopo avere\n"
+#~ "abilitato la tastiera. Il boot loader non aspetta se \"ritardo\" � "
+#~ "omesso\n"
+#~ "o se � fissato a 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 ""
+#~ "Adesso � il momento di configurare il sistema X-Windows, che � il cuore\n"
+#~ "della GUI (Interfaccia Grafica Utente) di GNU/Linux. A questo scopo,\n"
+#~ "devi configurare la tua scheda video e il monitor. La maggior parte\n"
+#~ "di queste fasi � automatizzata, per�, perci� il tuo lavoro consister�\n"
+#~ "solo nel verificare cosa � stato fatto e accettare le impostazioni :)\n"
+#~ "\n"
+#~ "Quando la configurazione � finita, sar� lanciato X (a meno che\n"
+#~ "tu dica a DrakX di non farlo) cos� che tu possa controllare se le\n"
+#~ "impostazioni sono corrette. Se non vanno bene, puoi tornare indietro e\n"
+#~ "cambiarle tutte le volte che � necessario."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Se qualcosa � sbagliato nella configurazione di X, usa queste opzioni "
+#~ "per\n"
+#~ "configurare correttamente il Sistema X Window."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Se preferisci usare un login grafico, scegli \"S�\". Altrimenti, scegli\n"
+#~ "\"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 ""
+#~ "Puoi scegliere un livello di sicurezza per il sistema. Consulta il "
+#~ "manuale per ulteriori\n"
+#~ "  informazioni. Come regola generale, se non sai cosa scegliere mantieni "
+#~ "l'opzione \n"
+#~ "predefinita.\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 ""
+#~ "Il sistema sta per essere riavviato.\n"
+#~ "\n"
+#~ "Dopo il riavvio, il tuo sistema Mandrake Linux sar� caricato "
+#~ "automaticamente.\n"
+#~ "Se vuoi avviare un altro sistema operativo, per favore leggi le "
+#~ "istruzioni\n"
+#~ "aggiuntive."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "Ceca (Programmatori)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slovacca (Programmatori)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Nome del profilo da creare:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Scrivi /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Ripristina da file"
+
+#~ msgid "Save in file"
+#~ msgstr "Salva su file"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Ripristina da floppy"
+
+#~ msgid "Format all"
+#~ msgstr "Formatta tutto"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Dopo la formattazione di tutte le partizioni,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "tutti i dati su queste partizioni saranna persi"
+
+#~ msgid "Reload"
+#~ msgstr "Ricarica"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "Vuoi generare un floppy di installazione automatica per replicare\n"
+#~ "questa installazione di Linux?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "Configurazione 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 ""
+#~ "Con un server remoto CUPS non devi configurare alcuna stampante\n"
+#~ "adesso: le stampanti saranno individuate automaticamente,\n"
+#~ "a meno che non dipendano da un server su una rete\n"
+#~ "diversa. In quest'ultimo caso � necessario\n"
+#~ "specificare l'indirizzo IP del server CUPS e, se vuoi, il numero della "
+#~ "porta."
+
+#~ msgid "Enter Printer Name and Comments"
+#~ msgstr "Inserisci il nome della stampante ed eventuali commenti"
+
+#~ msgid "Remote queue"
+#~ msgstr "Nome coda remota"
+
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Nome coda remota assente!"
+
+#~ msgid "Pipe into command"
+#~ msgstr "Invia tramite pipe al comando"
+
+#~ msgid ""
+#~ "Here you can specify any arbitrary command line into which the job should "
+#~ "be piped instead of being sent directly to a printer."
+#~ msgstr ""
+#~ "Qui potete indicare un qualsiasi comando arbitrario al quale il job "
+#~ "dovrebbe essere inviato per mezzo di una pipe invece di mandarlo "
+#~ "direttamente alla stampante."
+
+#~ msgid "Command line"
+#~ msgstr "Linea di comando"
+
+#~ msgid "A command line must be entered!"
+#~ msgstr "Dev'essere inserita una linea di comando!"
+
+#~ msgid "Settings"
+#~ msgstr "Impostazioni"
+
+#~ msgid "Profile "
+#~ msgstr "Profilo "
+
+#~ msgid "Statistics"
+#~ msgstr "Statistiche"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "Velocit� in trasmissione: "
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "Velocit� in ricezione: "
+
+#~ msgid "Connection Time: "
+#~ msgstr "Tempo di connessione: "
+
+#~ msgid "Logs"
+#~ msgstr "Log"
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Mi sto connettendo a Internet "
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Mi sto disconnettendo da internet "
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "La disconnessione da internet � fallita"
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "La disconnessione da internet � stata effettuata"
+
+#~ msgid "Connection complete."
+#~ msgstr "Connessione effettuata"
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "La connessione � fallita.\n"
+#~ "Verifica la tua configurazione nel Centro di Controllo Mandrake."
+
+#~ msgid "Color configuration"
+#~ msgstr "Configurazione colori"
+
+#~ msgid "sent: "
+#~ msgstr "inviato/a: "
+
+#~ msgid "received: "
+#~ msgstr "ricevuto/a: "
+
+#~ msgid "average"
+#~ msgstr "media"
+
+#~ msgid "Connect"
+#~ msgstr "Connetti"
+
+#~ msgid "Disconnect"
+#~ msgstr "Disconnetti"
+
+#~ msgid "/File/_New"
+#~ msgstr "/File/_Nuovo"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/File/_Apri"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/File/_Salva"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/File/Save _come"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Opzioni"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Opzioni/Test"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Aiuto"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Aiuto/_Riguardo..."
+
+#~ msgid "Default Runlevel"
+#~ msgstr "Runlevel predefinito"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Rimuovi coda"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr ""
+#~ "Non � stato possibile interpretare il contenuto del file di "
+#~ "configurazione."
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "File di configurazione sconosciuto"
+
+#~ msgid "Adapter"
+#~ msgstr "Adattatore"
+
+#~ msgid "Disable network"
+#~ msgstr "Disabilita rete"
+
+#~ msgid "Enable network"
+#~ msgstr "Abilita rete"
+
+#~ 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 ""
+#~ "Ora puoi provare il tuo mouse. Usa i pulsanti e la rotella per\n"
+#~ "verificare che i settaggi siano corretti. Se non lo sono, puoi cliccare "
+#~ "su\n"
+#~ "\"Annulla\" per scegliere un altro driver."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "Connessione DSL (o ADSL)"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr ""
+#~ "Puoi specificare direttamente l'URI per accedere alla stampante con CUPS."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "S�, stampa la pagina di prova ASCII"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "S�, stampa la pagina di prova Postscript"
+
+#~ msgid "Paper Size"
+#~ msgstr "Formato carta"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Espulsione pagina dopo il job?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Opzioni driver Uniprint"
+
+#~ msgid "Color depth options"
+#~ msgstr "Opzioni profondit� colore"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Stampa testo come PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Correggi lo stair-stepping del testo?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Numero di pagine per pagine di output"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Margine destro/sinistro in punti (1/72 di pollice)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Margine superiore/inferiore in punti (1/72 di pollice)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Opzioni GhostScript supplementari"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Opzioni testo supplementari"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Ordine pagine inverso"
+
+#~ msgid "CUPS starting"
+#~ msgstr "Sto avviando CUPS"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Scegli connessione stampante 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 ""
+#~ "Ogni stampante ha bisogno di un nome (per esempio lp).\n"
+#~ "Possono essere definiti altri parametri, come la descrizione della "
+#~ "stampante \n"
+#~ "o dove si trova. Che nome dovrebbe essere usato per questa\n"
+#~ "stampante e in che modo � connessa?"
+
+#~ 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 ""
+#~ "Ogni coda di stampa (a cui sono diretti i job di stampa) ha bisogno di\n"
+#~ "un nome (spesso lp) e una directory di spool associata ad esso. Che\n"
+#~ "nome e directory dovranno essere usati per questa coda e come � connessa\n"
+#~ "la stampante?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Nome della coda"
+
+#~ msgid "Spool directory"
+#~ msgstr "Directory di spool"
+
+#~ msgid "Disable"
+#~ msgstr "Disabilita"
+
+#~ msgid "Enable"
+#~ msgstr "Abilita"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Per avere un sistema pi� sicuro, dovresti scegliere \"Usa shadow file\" "
+#~ "e\n"
+#~ "\"Usa passwords MD5\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Se la tua rete usa NIS, scegli \"Usa NIS\". Se non sai, chiedi al tuo\n"
+#~ "amministratore di rete."
+
+#~ msgid "yellow pages"
+#~ msgstr "pagine gialle"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "Dns 1 del Provider"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "Dns 2 del provider"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Come vuoi connetterti a Internet?"
 
 #~ msgid "cannot fork: "
 #~ msgstr "non ho potuto sdoppiare: "
@@ -8328,9 +11685,6 @@ msgstr "Set di utilit� per posta, news, web, file transfer, e chat"
 #~ msgid "Opening your connection..."
 #~ msgstr "Sto attivando la tua connessione ..."
 
-#~ msgid "Standard tools"
-#~ msgstr "Programmi di utilit� standard"
-
 #~ msgid "Configuration de Lilo/Grub"
 #~ msgstr "Configurazione di Lilo/Grub"
 
@@ -8339,9 +11693,6 @@ msgstr "Set di utilit� per posta, news, web, file transfer, e chat"
 #~ "Questo script di avvio prova a caricare i moduli per il tuo\n"
 #~ "mouse usb."
 
-#~ msgid "Boot style configuration"
-#~ msgstr "Configurazione metodo di avvio"
-
 #~ msgid ""
 #~ "Now that your Internet connection is configured,\n"
 #~ "your computer can be configured to share its Internet connection.\n"
@@ -8499,9 +11850,6 @@ msgstr "Set di utilit� per posta, news, web, file transfer, e chat"
 #~ msgid "loopback"
 #~ msgstr "loopback"
 
-#~ msgid "None"
-#~ msgstr "Nessuno"
-
 #~ msgid "Which bootloader(s) do you want to use?"
 #~ msgstr "Quale bootloader(s) vuoi usare?"
 
@@ -8517,9 +11865,6 @@ msgstr "Set di utilit� per posta, news, web, file transfer, e chat"
 #~ msgid "Configure local network"
 #~ msgstr "Configura rete locale"
 
-#~ msgid "Disable networking"
-#~ msgstr "Disabilita rete"
-
 #~ msgid "Configure the Internet connection / Configure local Network"
 #~ msgstr "Configura la connessione a Internet / Configura una rete locale"
 
@@ -8567,9 +11912,6 @@ msgstr "Set di utilit� per posta, news, web, file transfer, e chat"
 #~ msgid "Configure timezone"
 #~ msgstr "Configura fuso orario"
 
-#~ msgid "Configure printer"
-#~ msgstr "Configura stampante"
-
 #~ msgid "(may cause data corruption)"
 #~ msgstr "(pu� causare danni ai dati)"
 
@@ -8664,9 +12006,6 @@ msgstr "Set di utilit� per posta, news, web, file transfer, e chat"
 #~ msgid "Update location"
 #~ msgstr "Aggiorna posizione"
 
-#~ msgid "Remove"
-#~ msgstr "Rimuovi"
-
 #~ msgid "Find Package"
 #~ msgstr "Trova Pacchetto"
 
@@ -8676,9 +12015,6 @@ msgstr "Set di utilit� per posta, news, web, file transfer, e chat"
 #~ msgid "Toggle between Installed and Available"
 #~ msgstr "Scegli tra Installato e Disponibile"
 
-#~ msgid "Uninstall"
-#~ msgstr "Disinstalla"
-
 #~ msgid "Choose package to install"
 #~ msgstr "Scegli pacchetti da installare"
 
@@ -8762,9 +12098,6 @@ msgstr "Set di utilit� per posta, news, web, file transfer, e chat"
 #~ msgid "I have found an ISDN Card:\n"
 #~ msgstr "Ho trovato una scheda ISDN:\n"
 
-#~ msgid "France"
-#~ msgstr "Francia"
-
 #~ msgid "Other countries"
 #~ msgstr "Altri paesi"
 
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index 6638229fb..ba7e76394 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.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: 1999-12-10 16:27+0100\n"
 "Last-Translator: YAMAGATA Hiroo <hiyori13@alum.mit.edu>\n"
 "Language-Team: Japanese\n"
@@ -14,24 +14,24 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\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 "Xinerama ��ĥ��Ȥ�"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "�ʲ��Υ����ɤ��������ꡧ \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "�ޥ���إå�����"
 
-#: ../../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 ""
 "���ʤ��Υ����ƥ�ϥޥ���إåɤ����꤬�Ǥ��ޤ���\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 �����Ф�����ǲ�����"
 
-#: ../../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 "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,17 +74,18 @@ msgstr ""
 "���Υ����ɤ�XFree %s �ǤΤ�3D��������졼������ǽ�Ǥ���\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 "���Υ����ɤ�XFree %s ��3D��������졼������ǽ�Ǥ���"
 
-#: ../../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��������졼�����Ĥ���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"
@@ -93,12 +94,12 @@ msgstr ""
 "���Υ����ɤ�XFree %s ��3D��������졼������ǽ�Ǥ���\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 "�¸��ʳ��Υϡ��ɥ�����3D��������졼�����Ĥ���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"
@@ -109,27 +110,31 @@ msgstr ""
 "�����������ޤǡ��¸�Ū�ʥ��ݡ��Ȥǡ��ޥ���ե꡼���β�ǽ��������ޤ���\n"
 "XFree %s �ǤΤ��Υ����ɤΥ��ݡ��Ȥϡ�2D �Τۤ���������Ƥ��ޤ���"
 
-#: ../../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 "�����ФΥ��ץ���������ǲ�����"
 
-#: ../../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"
@@ -150,40 +155,40 @@ 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"
@@ -191,152 +196,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 ������: %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 "�������ѡ��ȥ⡼��"
 
-#: ../../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
+#, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "����ե��å������� id: %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 ������: %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 System ������ν���"
 
-#: ../../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 "�����Х��ץ������ѹ�"
 
-#: ../../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"
@@ -349,20 +358,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?"
@@ -415,220 +424,228 @@ 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 "����������� VGA, 640x480 at 60Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "�����ѡ� VGA, 800x600 at 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 at 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 "�����ѡ� VGA, 1024x768 at 87 Hz interlaced, 800x600 at 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 "��ĥ �����ѡ� VGA, 800x600 at 60 Hz, 640x480 at 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 "1024x768 at 60 Hz, 800x600 at 72 Hz�ΥΥ󥤥󥿡��쥹SVGA"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "1280x1024 at 70 Hz��High Frequency SVGA"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "1280x1024 at 60 Hz����ǽ�ʥޥ����������˥�"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "1280x1024 at 74 Hz����ǽ�ʥޥ����������˥�"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "1280x1024 at 76 Hz����ǽ�ʥޥ����������˥�"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "1600x1200 at 70 Hz ����ǽ�ʥ�˥�"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "1600x1200 at 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 "�ƥ����ȥ�˥塼�� LILO"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "����ե��å���˥塼�� 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/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 "�֡��ȥ������Υᥤ�󥪥ץ����"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "���Ѥ���֡��ȥ�����"
 
-#: ../../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 �ʲ���ä�"
 
 # added a \n to the translation to avoid that the dialog window
 # in which it appears to be tooooo laaaaarge
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 "ɬ�פʤ����Τ�RAM������������Ƥ�������\n"
 "��%d MB�����Ĥ���ޤ�����"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "�ޥ���ץ��ե������ͭ����"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Ram��������MB������"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "�ȥ��ޥ�ɥ饤�󥪥ץ��������¡ɥ��ץ����ϥѥ���ɤ��ʤ���\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 "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 "�������å�����"
 
-#: ../../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 "CD ����ε�ư��ͭ���ˤ��ޤ�����"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "OF ����ε�ư��ͭ���ˤ��ޤ�����"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "�ǥե���Ȥ� 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."
@@ -636,146 +653,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 "¾�� OS (SunOS�ʤ�...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "¾�� OS (MacOS�ʤ�...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "¾�� OS (������ɥ����ʤ�...)"
 
-#: ../../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 "�롼��"
 
-#: ../../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 "�ɤ߽�"
 
-#: ../../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
+#: ../../any.pm_.c:278
 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 "����ȥ��ä�"
 
-#: ../../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
-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 "(�⥸�塼�� %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"
@@ -792,20 +807,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"
@@ -816,11 +831,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"
@@ -829,33 +844,33 @@ 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"
@@ -864,53 +879,65 @@ 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 "������"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "��������"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "��ư��������"
 
-#: ../../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 ""
-"��ưŪ�˥桼�����������󤹤�褦�˥���ԥ塼��������Ǥ��ޤ���\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 by SILO at boot time; that is
 # only the ascii charset will be available
 # so use only 7bit for this message
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:262 ../../bootloader.pm_.c:608
+#: ../../bootloader.pm_.c:259
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -934,51 +961,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 "GRUB operating system chooser-he youkosou!"
 
 #. -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, %c key wo tukatte entry wo shitei shite kudasai."
 
 #. -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 "Kono OS wo kidou suru nara Enter, Kidou mae no jikkou command"
 
 #. -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 "no henshuu niha 'e', command line nara 'c' wo oshi masu."
 
 #. -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 "Sentaku shita OS ga %d byou de jidoutekini kidou shimasu."
 
-#: ../../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
+#, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "�֡��ȥ������� %s �ѡ��ƥ������ˤϥ��󥹥ȡ���Ǥ��ޤ���\n"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "�إ�פϤޤ���������Ƥ��ޤ���\n"
@@ -991,604 +1023,564 @@ msgstr "��ư����������"
 msgid "/_File"
 msgstr "/�ե�����(F)"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/�ե�����(F)/����(N)"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/�ե�����(F)/����(O)"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/�ե�����(F)/��¸(S)"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/�ե�����(F)/�̤�̾������¸(A)"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/�ե�����(F)/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/�ե�����(F)/��λ(Q)"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/���ץ����(O)"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/���ץ����(O)/�ƥ���"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/�إ��(H)"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/�إ��(H)/���Υ��եȤˤĤ���(A)"
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "����"
-
-#: ../../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 ""
-"���󥿡��ͥå���³��ͭ�桼�ƥ���ƥ��ؤ褦������\n"
-"\n"
-"%s\n"
-"\n"
-"���ꥦ�������ɤ�ư����ˤϡ�����פ򥯥�å����ޤ��礦��"
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Lilo/grub �⡼��"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "�����������ʬ�व����˥�"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "�����������˥�"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "�դĤ��Υ�˥�"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "�դĤ��� Gtk+ ��˥�"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "��ư����Aurora��¹�"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/grub �⡼��"
+
+#: ../../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 ""
+"���ޡ��֡��ȥޥ͡�����ˤ� %s �򤪻Ȥ��Ǥ���\n"
+"���ꥦ�������ɤ�ư����ˤϡ�����פ򥯥�å����ޤ��礦��"
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "����"
+
+#: ../../bootlook.pm_.c:108
 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 "��ư���� X ������ɥ���¹�"
 
-#: ../../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 "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 "����󥻥�"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "/etc/inittab ���ɤߤȤ��Ѥ˳����ޤ���: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "/etc/sysconfig/autologin ���ɤߤȤ��Ѥ˳����ޤ���: $!"
+#: ../../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 "����"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "����ޥ����"
-
-#: ../../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
+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: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 ""
-"�ѡ��ƥ����������䤷�����ʤ顤��ĥ�ѡ��ƥ������\n"
-"����褦�ˤɤ����Υѡ��ƥ�������ä��Ʋ�������"
+"�ϡ��ɥǥ��������Τ��礭�� FAT �ѡ��ƥ�������Ĥ����Ǥ���\n"
+"�ʤ��֤�MS Dos/������ɥ����Τ�ΤǤ��ˡ�\n"
+"�ޤ��Ϥ����Ĥ�ꥵ��������Τ������Ǥ��礦\n"
+"�ʤ��Υѡ��ƥ������򥯥�å����ơ����ˡ֥ꥵ�����פ򥯥�å����Ʋ�����)"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "��ư������Ƥ��Ǥ���ۤɶ������̤�����ޤ���"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "�ѹ�����ѡ��ƥ������򥯥�å����Ƥ�������"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "��Ȥ��᤹"
+#: ../../diskdrake.pm_.c:240
+msgid "Please click on a media"
+msgstr "��ǥ����򥯥�å����Ƥ�������"
+
+#: ../../diskdrake.pm_.c:243
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr ""
+"��Υܥ���򥯥�å����뤫\n"
+"\n"
+"\"New\"��Ȥ��ޤ�"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "�ѡ��ƥ������ơ��֥�򹹿�"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr "\"New\"��Ȥ��ޤ�"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-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
+msgid "Journalised FS"
+msgstr "���㡼�ʥ�󥰥ե����륷���ƥ�"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
 msgstr "����å�"
 
-#: ../../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: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 ""
-"�ϡ��ɥǥ��������Τ��礭�� FAT �ѡ��ƥ�������Ĥ����Ǥ���\n"
-"�ʤ��֤�MS Dos/������ɥ����Τ�ΤǤ��ˡ�\n"
-"�ޤ��Ϥ����Ĥ�ꥵ��������Τ������Ǥ��礦\n"
-"�ʤ��Υѡ��ƥ������򥯥�å����ơ����ˡ֥ꥵ�����פ򥯥�å����Ʋ�����)"
+#: ../../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 "�ǡ����ΥХå����åפ��äƲ�����"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "���"
 
-#: ../../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:423
+msgid "Use ``Unmount'' first"
+msgstr "�ǽ�ˡ֥���ޥ���ȡפ�ȤäƲ�����"
 
-#: ../../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 ""
-"�⤷ aboot ��Ȥ��Ĥ��ʤ顢�ǥ���������Ƭ�˶����ΰ� (2048���������餤)\n"
-"��Ĥ��褦�����դ��Ʋ�������"
+"�ѡ��ƥ������η��� %s ���ѹ������塢���Υѡ��ƥ�������Υǡ����ϼ�����"
+"��"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-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: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:500
+msgid "Mount options"
+msgstr "�ޥ���ȥ��ץ����"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "�ޥ���ȥݥ����: "
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
+msgstr "����¾"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "�ǥХ���: "
+#: ../../diskdrake.pm_.c:525
+msgid "Removable media"
+msgstr "��ࡼ�Х֥��ǥ���"
 
-#: ../../diskdrake.pm_.c:240
-#, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS �ǥХ����쥿��: %s (����)\n"
+#: ../../diskdrake.pm_.c:532
+msgid "Change type"
+msgstr "�����פ��ѹ�"
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "������: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "�ɤΥե����륷���ƥ�ˤ��ޤ�����"
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "̾��: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr "nfs ��ͭ�꥽�����ǻȤ����Τ򥹥������"
 
-#: ../../diskdrake.pm_.c:253
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "Start: sector %s\n"
-msgstr "����: ������ %s\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr "������ %s �� nfs ��ͭ�꥽�����ǻȤ����Τ򥹥������"
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "������: %s"
+#: ../../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:256
-#, c-format
-msgid ", %s sectors"
-msgstr ", %s ������"
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "������"
+
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr "��ͭ�꥽����"
 
-#: ../../diskdrake.pm_.c:258
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr "samba ��ͭ�꥽�����ǻȤ����Τ򥹥������"
+
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "������ %d ���饷���� %d\n"
+msgid "Scanning available samba shared resource of server %s"
+msgstr "������ %s �� samba ��ͭ�꥽�����ǻȤ����Τ򥹥������"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "�ե����ޥåȺѤ�\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose a partition"
+msgstr "�ѡ��ƥ�����������"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "̤�ե����ޥå�\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose another partition"
+msgstr "�̤Υѡ��ƥ�����������"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "�ޥ���ȺѤ�\n"
+#: ../../diskdrake_interactive.pm_.c:188
+msgid "Exit"
+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 expert mode"
+msgstr "�������ѡ��ȥ⡼�ɤ˰ܤ�"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "�롼�ץХå��ե�����: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+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:210
+msgid "Undo"
+msgstr "��Ȥ��᤹"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "��٥� %s\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "����Ǥ�³���ޤ�����"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "����󥯥����� %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "�����֤�����λ"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID�ǥ����� %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "�ѡ��ƥ������ơ��֥�򹹿������˽�λ��"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "�롼�ץХå��ե�����̾: %s"
+#: ../../diskdrake_interactive.pm_.c:237
+msgid "Do you want to save /etc/fstab modifications"
+msgstr " /etc/fstab ���ѹ�����¸���ޤ�����"
+
+#: ../../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_interactive.pm_.c:250
+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.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 ""
-"\n"
-"���Υѡ��ƥ������Ϥɤ���\n"
-"�ɥ饤�С��ѡ��ƥ������餷���Ǥ��衣\n"
-"������ʤ��ۤ��������Ǥ��礦��\n"
+"�ѡ��ƥ����������䤷�����ʤ顤��ĥ�ѡ��ƥ������\n"
+"����褦�ˤɤ����Υѡ��ƥ�������ä��Ʋ�������"
+
+#: ../../diskdrake_interactive.pm_.c:285
+msgid "Save partition table"
+msgstr "�ѡ��ƥ������ơ��֥����¸"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:286
+msgid "Restore partition table"
+msgstr "�ѡ��ƥ������ơ��֥�����"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "�ѡ��ƥ������ơ��֥��Ĥ�"
+
+#: ../../diskdrake_interactive.pm_.c:289
+msgid "Reload partition table"
+msgstr "�ѡ��ƥ������ơ��֥����ɹ�"
+
+#: ../../diskdrake_interactive.pm_.c:293
+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
+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 "�Х� %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 "�롼�ץХå��λ���"
 
-#: ../../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 ""
-"�����ʤ����������ϥɥ饤�֤Τ��ʤ���Τۤ�(������>1024)�ʤΤ�\n"
-"������ /boot �Ϻ��ޤ���/boot���������ȡ�LILO �����ޤ�Ư���ʤ�����\n"
-"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 ""
-"���ޥ롼��(/)�Ѥ�������ѡ��ƥ������ϡ�ʪ��Ū�˥ɥ饤�֤���Ƭ����\n"
-"1024 ���������󤯤ˤ��äơ�����ˤ��ʤ���/boot �ѡ��ƥ�������\n"
-"���äƤ��ޤ���͡�LILO ��֡��ȥޥ͡�����˻Ȥ��ʤ顤/boot �ѡ��ƥ�\n"
-"�������ɲä�˺��ʤ���"
-
-#: ../../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 ""
-"���ʤ��ϥ롼��(/)�ȤȤ��ƥ��եȥ�����RAID�ѡ��ƥ����������Ӥޤ����͡�\n"
-"/boot �ѡ��ƥ������̵���Ǥ�����������֡��ȥ������Ϥ���ޤ���\n"
-"�Ǥ����� /boot �ѡ��ƥ��������ɲä�˺��ʤ���"
+#: ../../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 "�ǽ�ˡ֥���ޥ���ȡפ�ȤäƲ�����"
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "MB �ǤΥ�����: "
 
-#: ../../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 "�ե����륷���ƥॿ����: "
 
-#: ../../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 "�ޥ���ȥݥ����: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "�����֤�����λ"
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "�ץ�ե����: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "�ѡ��ƥ������ơ��֥�򹹿������˽�λ��"
+#: ../../diskdrake_interactive.pm_.c:462
+msgid "Remove the loopback file?"
+msgstr "�롼�ץХå��ե�����������ޤ�����"
 
-#: ../../diskdrake.pm_.c:516
+#: ../../diskdrake_interactive.pm_.c:486
 msgid "Change partition type"
 msgstr "�ѡ��ƥ�����󥿥��פ��ѹ�"
 
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "�ɤΥե����륷���ƥ�ˤ��ޤ�����"
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr "ext2 ���� ext3 ���ѹ����Ƥ��ޤ�"
 
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "32MB�ʲ��Υѡ��ƥ������� ReiserFS �ϻȤ��ޤ���"
-
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake_interactive.pm_.c:521
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "�롼�ץХå��ե����� %s ��ɤ��˥ޥ���Ȥ��ޤ�����"
 
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "�ǥХ��� %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"
@@ -1597,221 +1589,384 @@ msgstr ""
 "�ޥ���ȥݥ���Ȥ����꽢�����Ȥ�����ޤ���\n"
 "�ޤ��롼�ץХå��������Ƥ���������"
 
-#: ../../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 "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 "�롼�ץХå��ե����� %s ��ե����ޥå���"
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "���Υѡ��ƥ������ϥꥵ�����Ǥ��ޤ���"
 
-#: ../../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 "���Υѡ��ƥ�������Υǡ����ϥХå����åפ���٤��Ǥ�"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "���ƤΥѡ��ƥ�������ե����ޥåȤ�����,"
+#: ../../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
+msgid "New size in MB: "
+msgstr "MB �ǤΥ�����: "
 
-#: ../../diskdrake.pm_.c:577
+#: ../../diskdrake_interactive.pm_.c:631
 msgid "Which disk do you want to move it to?"
 msgstr "�ɤΥǥ������˰�ư���ޤ���?"
 
-#: ../../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 "�ɤΥ��������ư���ޤ�����"
 
-#: ../../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 "�ɲä����¸�� 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_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM ̾�ϡ�"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "���Υѡ��ƥ������ϥ롼�ץХå��ˤϻȤ��ޤ���"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "�롼�ץХå�"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "�롼�ץХå��ե�����̾: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+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 "����󥯥�����"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "����: �������ϴ����Ǥ���"
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "�ɤ�ʥѡ��ƥ������Ǥ�����"
+
+#: ../../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 ""
+"�����ʤ����������ϥɥ饤�֤Τ��ʤ���Τۤ�(������>1024)�ʤΤ�\n"
+"������ /boot �Ϻ��ޤ���/boot���������ȡ�LILO �����ޤ�Ư���ʤ�����\n"
+"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 ""
+"���ޥ롼��(/)�Ѥ�������ѡ��ƥ������ϡ�ʪ��Ū�˥ɥ饤�֤���Ƭ����\n"
+"1024 ���������󤯤ˤ��äơ�����ˤ��ʤ���/boot �ѡ��ƥ�������\n"
+"���äƤ��ޤ���͡�LILO ��֡��ȥޥ͡�����˻Ȥ��ʤ顤/boot �ѡ��ƥ�\n"
+"�������ɲä�˺��ʤ���"
+
+#: ../../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 ""
+"���ʤ��ϥ롼��(/)�ȤȤ��ƥ��եȥ�����RAID�ѡ��ƥ����������Ӥޤ����͡�\n"
+"/boot �ѡ��ƥ������̵���Ǥ�����������֡��ȥ������Ϥ���ޤ���\n"
+"�Ǥ����� /boot �ѡ��ƥ��������ɲä�˺��ʤ���"
+
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "�ɥ饤�� %s �Υѡ��ƥ������ơ��֥��ǥ������˽񤭹��ߤޤ���"
 
-#: ../../diskdrake.pm_.c:594
+#: ../../diskdrake_interactive.pm_.c:868
 msgid "You'll need to reboot before the modification can take place"
 msgstr "��֡��Ȥ��ƥѡ��ƥ������ơ��֥���ѹ���ȿ�Ǥ�����ɬ�פ�����ޤ�"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "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
-msgid "This partition is not resizeable"
-msgstr "���Υѡ��ƥ������ϥꥵ�����Ǥ��ޤ���"
+#: ../../diskdrake_interactive.pm_.c:882
+#, c-format
+msgid "Formatting loopback file %s"
+msgstr "�롼�ץХå��ե����� %s ��ե����ޥå���"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "���Υѡ��ƥ�������Υǡ����ϥХå����åפ���٤��Ǥ�"
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
+#, c-format
+msgid "Formatting partition %s"
+msgstr "�ѡ��ƥ������ %s ��ե����ޥå���"
+
+#: ../../diskdrake_interactive.pm_.c:894
+msgid "Hide files"
+msgstr "�ե�����򱣤�"
+
+#: ../../diskdrake_interactive.pm_.c:894
+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 ""
+"�ǥ��쥯�ȥ� %s �ˤϤ��Ǥ˥ǡ���������ޤ�\n"
+"(%s)"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "������������������"
+#: ../../diskdrake_interactive.pm_.c:906
+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 "MB"
+#: ../../diskdrake_interactive.pm_.c:910
+#, c-format
+msgid "Copying %s"
+msgstr "%s ���ԡ���"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "�������ѡ��ƥ����������"
+#: ../../diskdrake_interactive.pm_.c:914
+#, c-format
+msgid "Removing %s"
+msgstr "%s �����"
 
-#: ../../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 "MB �ǤΥ�����: "
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS �ǥХ����쥿��: %s (����)\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "�ե����륷���ƥॿ����: "
+#: ../../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 "̾��: "
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "���Υѡ��ƥ������ϥ롼�ץХå��ˤϻȤ��ޤ���"
+#: ../../diskdrake_interactive.pm_.c:954
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "����: ������ %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "�롼�ץХå�"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "������: %s"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "�롼�ץХå��ե�����̾: "
+#: ../../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 "�ե�����Ϥ��Ǥ��̤Υ롼�ץХå��ǻ����档¾�Τ����Ӥޤ��礦"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "������ %d ���饷���� %d\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "�ե�����Ϥ��Ǥ�¸�ߤ��ޤ������ޤ���Τ�Ȥ��ޤ�����"
+#: ../../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_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "�ޥ���ȺѤ�\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 ""
-"�Хå����åפ���ѡ��ƥ������ơ��֥�Υ��������㤤�ޤ�\n"
-"³���ޤ�����"
+"�롼�ץХå��ե�����:\n"
+"   %s\n"
 
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "�ٹ�"
-
-#: ../../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 ""
-"�ե��åԡ���ɥ饤�֤��������Ƥ�������\n"
-"�ե��åԡ�������ƤΥǡ����ϼ����ޤ�"
+"�ǥե���Ȥǥѡ��ƥ������֡���\n"
+"    (MS-DOS �Υ֡���, lilo �ǤϤʤ�)\n"
 
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "�ѡ��ƥ������ơ��֥��߽Ф��Ƥߤ�"
+#: ../../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�ǥ����� %s\n"
 
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "����󥯥�����"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "�롼�ץХå��ե�����̾: %s"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "�ɲä����¸�� 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 ""
+"\n"
+"���Υѡ��ƥ������Ϥɤ���\n"
+"�ɥ饤�С��ѡ��ƥ������餷���Ǥ��衣\n"
+"������ʤ��ۤ��������Ǥ��礦��\n"
 
-#: ../../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 ""
+"\n"
+"�������̤� Bootstrap\n"
+"�ѡ��ƥ������ϡ�\n"
+"�ǥ奢��֡��ȥ����ƥ��ѤǤ���\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "�ɲä����¸�� LVM ������ǲ�����"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "������: %s\n"
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "LVM ̾�ϡ�"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "������ȥ�: %s ������, %s �إå�, %s ������\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "��ࡼ�Х֥��ǥ�����ư�ޥ������"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "����: "
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "�ѡ��ƥ������ơ��֥��Ĥ�"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM�ǥ����� %s\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "�������"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "�ѡ��ƥ������ơ��֥륿����: %s\n"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../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 "���ץ����: %s"
+
+#: ../../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 ���ԡ�exit code  %d �ޤ��� signal %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"
@@ -1824,41 +1979,44 @@ msgstr "��ñ��"
 msgid "server"
 msgstr "������"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "16MB�ʲ��Υѡ��ƥ������� JFS �ϻȤ��ޤ���"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "32MB�ʲ��Υѡ��ƥ������� ReiserFS �ϻȤ��ޤ���"
+
+#: ../../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 "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"
 "��ɬ�פǤ���\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"
@@ -1866,509 +2024,895 @@ msgstr ""
 "���顼ȯ�� - �������ե����륷���ƥ���ۤǤ���褦�ʥǥХ�����\n"
 "���դ���ޤ��󡣤ʤˤ����������ϡ��ɥ�����������å����Ƥ�������"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "�ѡ��ƥ�����󤬤���ޤ���"
 
-#: ../../help.pm_.c:9
-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"
+#: ../../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 ""
+"GNU/Linux �ϥޥ���桼�������ƥ�Ǥ����Ĥޤ�ƥ桼���ϼ�ʬ�ι����������\n"
+"�ե�������Ƥޤ����ܤ����ϡ��桼���������ɤ��ɤ�Ǥ���������\n"
+"�Ǥ�����ԤǤ��� root �ȤϤ����äơ����ʤ����������ɲä���桼���ϡ���ʬ\n"
+"�Υե�����ȼ�ʬ������ʳ��Τ�Τ��Ѥ��븢�¤�����ޤ��󡣼�ʬ�Ѥ˾��ʤ�\n"
+"�Ȥ��İ��̥桼�����äƤ����������դĤ��Ȥ��Ȥ��ˤϡ����Υ�������Ȥ�\n"
+"�Ȥ��ޤ������� root �ǥ������󤹤�ȼ�֤Ͼʤ��ޤ������ȤäƤ�����Ǥ�!\n"
+"����äȤ����ޤ������ǥ����ƥबư���ʤ��ʤ꤫�ͤޤ��󡣤⤷���̥桼����\n"
+"�ɼ�ʥߥ��򤷤Ƥ⡢��������򼺤����⤷��ޤ��󤬡������ƥ����Τˤϱƶ�\n"
+"���ޤ���\n"
+"\n"
+"�ޤ�����̾������ޤ��������ɬ������ɬ�פ���ޤ��󡣼ºݤˤϹ����ʤ�Τ�\n"
+"������ޤ�������� drakX �Ϥ��ʤ������Ϥ����ǽ��ñ���Ȥäơ������\n"
+"�桼��̾�ǻȤ��ޤ�������ϡ����Υ桼���������ƥ�˥������󤹤�Ȥ���̾��\n"
+"�ˤʤ�ޤ���������Ѥ��뤳�Ȥ�Ǥ��ޤ������줫��ѥ���ɤ����Ϥ��ޤ���\n"
+"�ø��ʤ��Ρʰ��̡˥桼���Υѥ���ɤϡ��������ƥ��δ�������� root ��\n"
+"�ѥ���ɤۤɽ��פǤϤ���ޤ��󤬡�������Ȥ��äư°פʤ��ȤϤ��ʤ��Ǥ�\n"
+"�����������ʤ��Υե����뤬�����ˤ��餵��ޤ���\n"
+"\n"
+"�֥桼�����ɲáפ򥯥�å������顢�����ʤ����桼�����ɲäǤ��ޤ�����֤�\n"
+"���줾��˥�������Ȥ�Ĥ���ޤ��礦�����㤵������ʬ�Ǥ⡣�����ʤ�����\n"
+"�桼�����ɲä��������顢�ִ�λ�פ򲡤��ޤ��礦��\n"
+"\n"
+"�ֹ��٤�����ץܥ���򲡤��ȡ����Υ桼���Υǥե���ȤΥ�������Ѥ�����\n"
+"���ʥǥե���Ȥ� bash��"
+
+#: ../../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 ""
-"���󥹥ȡ����³����ˤϡ���Υ饤���󥹤ξ���Ʊ�դ��Ƥ���������\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"
-"����Ʊ�դ���ʤ��Ʊ�դ���פ򥯥�å����ޤ��礦��\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"
-"���ΤޤޤǤ�"
-
-#: ../../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\"."
+"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"
-"\n"
-"\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\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"
+"�ϡ��ɥǥ�������˸��Ф��줿����¸�� Linux �ѡ��ƥ���������\n"
+"�����ޤ������������ɤ�����򤽤Τޤޤˤ��Ƥ����Ƥ⤤���Ǥ��礦��\n"
+"�̾�����Ѥˤ����ꤢ��ޤ���������Ѥ����顢����Ǥ� root\n"
+"�ѡ��ƥ������ʡ�/�סˤ���ꤷ�Ƥ������������ޤ꾮�����ѡ��ƥ������\n"
+"�򤳤������֤ȡ����եȤ������ڤ�ʤ��ʤ�ޤ��衣�ޤ����ǡ������̤�\n"
+"�ѡ��ƥ������˵���������С���/home�פ���ꤷ�ޤ��礦�ʤ���ϡ�\n"
+"Linux �ѡ��ƥ������ʣ���ʤ����Բ�ǽ�Ǥ����ˡ�\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"
+"���ʤߤ˳ƥѡ��ƥ������ϰʲ��ν񼰤ǵ󤬤äƤ��ޤ�: ��̾���ס����̡�\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"
+"��̾���פϼ��ν񼰤Ǥ�: �֥ϡ��ɥǥ���������ס֥ɥ饤���ֹ��\n"
+"�֥ѡ��ƥ�������ֹ�סʤ��Ȥ��С�hda1��)\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�����󥹥ȡ��뤵��Ƥ��ʤ�����ʣ���� OS\n"
-"���¹Ԥ��ƻȤ����ˤϡ��֥��󥹥ȡ���פ����Ӥޤ��礦��\n"
 "\n"
+"�֥ϡ��ɥǥ���������פϡ�IDE �ǥ������ʤ��hd�פǡ�SCSI �ʤ��sd��\n"
+"�Ǥ���\n"
 "\n"
-"�Ť�Linux-Mandrake�򹹿��������Τʤ�ֹ����פ����Ӥޤ���\n"
 "\n"
+"�֥ɥ饤���ֹ�פϡ���hd�פ��sd�פθ�ˤĤ�ʸ���Ǥ���IDE�ʤ�:\n"
 "\n"
-"GNU/Linux �ؤν����٤˱����ơ��ʲ��Υ��󥹥ȡ��롦������٥뤬\n"
-"���٤ޤ�:\n"
+"   * ��a�פϥץ饤�ޥꥳ��ȥ������Υޥ����ǥ�����\n"
 "\n"
-"\t* �侩: GNU/Linux \t  �Υ��󥹥ȡ���Ͻ��ơ��Ȥ����ͤϤ��������Ǥ�����"
-"����\n"
-"\t  ���뤵������⤢�ޤꤢ�뤯���ȤƤ��ñ�˥��󥹥ȡ���Ǥ��ޤ���\n"
+"   * ��b�פϥץ饤�ޥꥳ��ȥ������Υ��졼�֥ǥ�����\n"
 "\n"
+"   * ��c�פϥ��������IDE����ȥ������Υޥ����ǥ�����\n"
 "\n"
-"\t* �������ޥ���: GNU/Linux �Τ��Ȥ�褯�ΤäƤ���ͤϡ������ƥ��\n"
-"\t  ��ʻȤ���������Ǥ��������ʥ�����ơ�����󡢥����С���ȯ�ˡ�\n"
-"\t  �ֿ侩�פ��Ϥ����������������뤳�Ȥˤʤ�Τǡ����Υ��饹��\n"
-"\t  ���֤ˤ� GNU/Linux �λ��ȤߤˤĤ����μ�������ޤ���\n"
+"   * ��d�פϥ��������IDE����ȥ������Υ��졼�֥ǥ�����\n"
 "\n"
 "\n"
-"\t* �������ѡ���: GNU/Linux �˾ܤ����ͤϡ����Υ��󥹥ȡ��륯�饹��\n"
-"\t  ���٤ޤ����֥������ޥ����פ�Ʊ�������礢ʻȤ�ʡʥ�����ơ������\n"
-"\t  �����С���ȯ�ˤ����٤ޤ������Υ��󥹥ȡ��륯�饹����������\n"
-"\t  �褯�ͤ��Ƥ��������������ƥ������ಽ�������󥹥ȡ��뤬�Ǥ��ޤ���\n"
-"\t  GNU/Linux�ˤĤ��Ƥ�ۤɾܤ����ʤ��ȡ��ʤ��ʤ��������ʤ����䤬\n"
-"\t  ����ޤ����狼�ä��Ͱʳ��ϡ����Υ��饹�����Фʤ����ȡ�"
+"SCSI �ϡ��ɥǥ������ξ�硢��a�פ�SCSI ID�ֹ�Ǿ��Υǥ�������\n"
+"��b�פϤ��μ���ID�ֹ桢�Ȥ������Ǥ�"
+
+#: ../../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 ""
+"Mandrake Linux ���󥹥ȡ����CDROM����ˤޤ�����ޤ���DrakX\n"
+"�ϡ�������ѥå��������̤�CDROM��ˤ���Ȥ��ϡ����ޤ�CD��\n"
+"�Ǥ��Ф��ơ�ɬ�פ��̤� CD �������褦�׵ᤷ�ޤ���"
 
-#: ../../help.pm_.c:56
+#: ../../help.pm_.c:77
 msgid ""
-"Select:\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"
-"  - 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"
+"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"
-"  - 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"
+" * \"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"
-"    ���碌�����Ӥޤ��礦���ܤ����ϰʲ��򻲾Ȥ��Ƥ���������\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"
+" * \"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"
+"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"
+"Mandrake Linux �ǻȤ��륽�եȤϲ���Ȥ���ޤ�����������Ф�����ͤ�\n"
+"���ޤ���\n"
+"\n"
+"CDROM �����ɸ�।�󥹥ȡ���򤷤Ƥ���ʤ顢�ޤ��������CD�򶵤���褦\n"
+"�����ޤ��������CD�Υ�٥��Ĵ�٤ơ����󥹥ȡ����Ѥ˻Ȥ���CD�Υ����å�\n"
+"�ܥå�����ϥ��饤�Ȥ��ޤ��礦�������������OK�򥯥�å����ޤ���\n"
+"\n"
+"�ѥå������ϡ��ޥ���λȤ����˱����ƥ��롼�פ��ȤˤޤȤ���Ƥ��ޤ���\n"
+"���롼�׼��Τ⣴�Ĥ���ʬ����������Ƥ��ޤ�:\n"
+"\n"
+" * ������ơ������: ������ơ������Ȥ��ƥޥ����Ȥ��ʤ顢�ʲ���\n"
+"���롼�פǻȤ���Τ��������Ӥޤ��礦��\n"
+"\n"
+" * ����ե��å��Ķ�: �����ǤϹ��ߤΥ���ե��å��Ķ������Ӥޤ���\n"
+"����ե��å�������ơ�����󤬤ۤ�����С������Ĥ����Ӥޤ��礦!\n"
+"\n"
+" * ��ȯ: �ޥ����ץ�����ߥ󥰤˻Ȥ��ʤ顢�ʲ�����ۤ������롼�פ�\n"
+"�����ĤǤ����Ӥޤ��礦��\n"
+"\n"
+" * ������: �Ǹ�ˡ����줬�������ѥޥ���ˤʤ�ʤ顢�ޥ���˥���\n"
+"�ȡ��뤷��������Ū�ʥ����ӥ��򤳤������٤ޤ���\n"
+"\n"
+"�ޥ����Υ�������򥰥롼��̾���ư�����ȡ����Υ��롼�פˤĤ��Ƥ�û��\n"
+"�������Ǥޤ���\n"
+"\n"
+"�ֹ��٤�����ץܥ���򲡤��ȡ��ָ��̥ѥå�����������ץ��ץ����\n"
+"���Ȥ���褦�ˤʤ�ޤ����󶡤���Ƥ���ѥå���������Τ��Ƥ��뤫��\n"
+"���󥹥ȡ��뤵����Τ������İ���������Ф����Ȥ��ޤ���\n"
+"\n"
+"���󥹥ȡ����ֹ����ץ⡼�ɤǳ��Ϥ����顢�����롼�פ�������ˤ���\n"
+"�ȿ������ѥå����������줺�ˡ���¸�����ƥ�ν��������򤹤�����ˤ�\n"
+"��ޤ���\n"
+"\n"
+"�Ǹ�ˡ����̥ѥå���������������ˤϡ����٤ƤΥѥå������򥰥롼��\n"
+"�ȥ��֥��롼���̤ˤޤȤ᤿�ĥ꡼��ɽ������ޤ������Υĥ꡼�򸫤ʤ���\n"
+"���롼�״ݤ��ȡ����֥��롼�״ݤ��ȡ��ѥå��������̤��ɲú���Ǥ��ޤ���\n"
+"\n"
+"�ĥ꡼�Υѥå����������֤ȡ��������������˽Фޤ���\n"
+"���򤬽���ä���֥��󥹥ȡ���ץܥ���򲡤��ޤ��礦�����󥹥ȡ��뤬\n"
+"�Ϥޤ�ޤ����ѥå������򤿤�����������ͤϡ����֤�������ΤǤ���Ǥ�\n"
+"�ɤ�����\n"
+"\n"
+"!! �����Хѥå�������������顢���줬�տ�Ū�Ǥⲿ�����롼�פΰ���\n"
+"�Ǥ⡢�����˥��󥹥ȡ��뤷��������ǧ������ޤ���Mandrake Linux\n"
+"�Ǥϡ����󥹥ȡ��뤷�������Фϵ�ư���˥ǥե���Ȥǵ�ư����ޤ���\n"
+"�вٻ��ˤϰ����Ǥ⡢�夫�饻�����ƥ��ۡ��뤬���Ĥ��뤳�Ȥ⤢��\n"
+"�ޤ�������Ū�ˤϡ��⤷���줬�ɤ�ʥ����ӥ����狼��ʤ���С���No�פ�\n"
+"����å�����Ф����Ǥ��礦����Yes�פ򥯥�å������顢�ǥե���Ȥ�\n"
+"ͭ���ˤʤ�ޤ��� !!\n"
+"\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"
+"!! 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"
+"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"
+"���٤ƤΥѥå����������롼�פ��Ȥ�ʬ�व��ƥĥ꡼ɽ������ޤ���\n"
+"���Υĥ꡼�򸫤ʤ��顢���롼�פ䥵�֥��롼��ñ�̡��ޤ��ϸ���\n"
+"�ѥå�����������������������Ǥ��ޤ���\n"
+"\n"
+"�ĥ꡼�Υѥå����������֤ȡ����ˤ����������Фޤ������ӽ���ä���\n"
+"�֥��󥹥ȡ���ץܥ���򲡤��ޤ��礦�����󥹥ȡ��뤬�Ϥޤ�ޤ���\n"
+"�ϡ��ɥ�������®�٤�������ѥå������ο��ˤ�äƤϡ����󥹥ȡ���\n"
+"��λ�ޤǤˤ��ʤ���֤�������ޤ�����λ�ޤǤο�����郎ɽ�������\n"
+"�Τǡ�����򸫤Ƥʤ�Ǥ����餪��Ǥ�ɤ�����\n"
+"\n"
+"!! �����Хѥå�������������ꡢ���뤤�Ϥ��줬�ɤ����Υ��롼�פ�\n"
+"�ޤޤ�Ƥ������ˤϡ����Υ����Ф������˥��󥹥ȡ��뤷��������\n"
+"��ǧ������ޤ���Mandrake Linux�Ǥϡ����󥹥ȡ��뤵�줿������\n"
+"�ϥǥե���Ȥǵ�ư���ˤ���������ޤ������Υǥ����ȥ�ӥ塼�����\n"
+"�вٻ��ˤϰ��������꤬�Τ��Ƥ��ʤ��Ƥ⡢���ΥС�����������\n"
+"�������ƥ��ۡ��뤬���Ĥ��뤫�⤷��ޤ��󡣤⤷���Υ����ӥ�������\n"
+"����Τ�Τ����ʤ����󥹥ȡ��뤵���Τ����狼��ʤ���С֤�������\n"
+"�򥯥�å����ޤ��礦���֤Ϥ��פ򥯥�å�����ȡ������Υ����ӥ���\n"
+"���󥹥ȡ��뤵��ơ��ǥե���Ȥǵ�ư���ˤ���������ޤ��� !!\n"
+"\n"
+"�ְ�¸�ط��μ�ư���ץ��ץ��������֤ȡ����󥹥ȡ��餬��ưŪ��\n"
+"�ѥå�������������Ȥ��ˤ�ٹ�������������Фޤ��󡣤ʤ�����˥�\n"
+"�å����������֤��ȸ����ȡ��ۤ��Υѥå������򥤥󥹥ȡ��뤹��Ȥ�\n"
+"��ɬ�פȤʤ�ѥå����������äơ����줬�ʤ��ȥ��󥹥ȡ��뤬��λ��\n"
+"�ʤ�����Ǥ���\n"
+"\n"
+"�����β��ˤ��뾮���ʥե��åԡ��ǥ������Υ�������ϡ������Υ���\n"
+"�ȡ������������ѥå������������ɤ߹��ि��Τ�ΤǤ������Υ���\n"
+"��������֤ȡ������Υ��󥹥ȡ���κǸ�˺�ä��ե��åԡ��������\n"
+"�褦�˻ٻ����Фޤ������������ե��åԡ��κ�����ϡ��������Υ��ƥå�\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"
+"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 wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
+msgstr ""
+"�ޥ���򥤥󥿡��ͥåȤ�LAN�ˤĤʤ������ʤ顢���������ץ����������\n"
+"�������������餫���᤽�ΥǥХ����Υ����å�������ơ�DrakX�������ư\n"
+"���ФǤ���褦�ˤ��Ƥ����ޤ��礦��\n"
+"\n"
+"Mandrake Linux �ϥ��󥹥ȡ�����˥��󥿡��ͥå���³�������Ǥ��ޤ���\n"
+"��ǽ����³�ϡ����̤Υ�ǥࡢISDN��ǥࡢADSL��³�������֥��ǥࡢ������\n"
+"�̾��LAN��³�ʥ������ͥåȡˤǤ���\n"
+"\n"
+"�����Ǥ�����κ٤����äϤ��ޤ��󡣤��������󥿡��ͥåȥ����ӥ��ץ��Х���\n"
+"�䥷���ƥ�����Ԥˤ��ä��ѥ�᡼���������Ѱդ��Ƥ����Ƥ���������\n"
+"\n"
+"����ξܺ٤ϡ��ޥ˥奢��Υ��󥿡��ͥå���³�ξϤ򸫤뤫�����뤤��ñ��\n"
+"�����ƥ����꤬����Ǥ��顢��������������ץ�������Ȥä���³�����ꤷ\n"
+"�ޤ��礦��\n"
+"\n"
+"�ͥåȥ��������ϥ��󥹥ȡ����ˤ�ꤿ�������뤤�ϥͥåȥ�����꤬\n"
+"����Ǥ���ʤ�֥���󥻥�פ򲡤��ޤ���"
+
+#: ../../help.pm_.c:172
+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"
+"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"
+"\n"
+"�����ˤϸ��ߤΥ��󥹥ȡ���ǻȤ��륵���ӥ��������󤬤äƤ��ޤ���\n"
+"�褯���ơ���ư����ɬ������ɬ�פʤ���ΤΥ����å���Ϥ����ޤ��礦��\n"
 "\n"
+"���ܤξ�˥ޥ������äƤ���ȡ����줬���Υ����ӥ�����������\n"
+"�����ʿ᤭�Ф����ФƤ��ޤ����Ǥ⡢���Υ����ӥ������Ω�Ĥ��狼��\n"
+"�ʤ���С��ǥե���ȤΤޤޤˤ��Ƥ����ۤ���̵��Ǥ���\n"
 "\n"
-"  - �������ѡ���: �����������GNU/Linux�˾ܤ����ͤ��������ü��\n"
-"    ���󥹥ȡ���򤷤����������Ӥޤ����֥������ޥ�����\n"
-"    �Υ��󥹥ȡ����Ʊ��������ʬ�Υ����ƥ�λȤ��������٤ޤ���\n"
-"    �Ǥ⡢�����˼������ʤ��ʤ顢���Фˤ���ϻȤ�ʤ��Ǥ���������"
+"���Υޥ���򥵡��Фˤ���Ĥ��ʤ顢�����Ǥ��ä˵���Ĥ��ޤ��礦��\n"
+"�Ȥ�ʤ������ӥ�����ߤ˳��Ϥ����ƤϤ����ޤ��󡣰����Υ����ӥ��ϡ�\n"
+"�����о�ǻȤ��ȴ������Ȥ����Τ�˺��ʤ���\n"
+"���̤ˡ�������ɬ�פʥ����ӥ���������Ǥ���������"
 
-#: ../../help.pm_.c:68
+#: ../../help.pm_.c:188
 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"
-"\n"
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
+msgstr ""
+"Linux �ϻ��֤�GMT���Ĥޤ�֥���˥å�ɸ����פǴ������Ƥ��ơ������\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"
-"\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"
+"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"
-"\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 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 ""
-"�ޥ���λȤ����������ʤ���ϤĤޤꡢ���ʤ������󥹥ȡ���������\n"
-"�֥�������פ��֥������ѡ��ȡפ��������Ȥ��ޤ��ˤϰʲ����̤�:\n"
-"\n"
+"X (X ������ɥ������ƥ�) �ϡ�GNU/Linux ����ե��å����󥿡��ե�������\n"
+"����ǡ�Mandrake Linux �ˤĤ��Ƥ��륰��ե��å��Ķ� (KDE, Gnome, \n"
+"AfterStep, WindowMaker...)�Ϥ��٤Ƥ���˰�¸���ޤ��������Ǥϡ�drakX\n"
+"�ϼ�ưŪ�� X �����ꤷ�褦�Ȥ��ޤ���\n"
 "\n"
-"  - ������ơ������: �ޥ�����˥ǥ����ȥåפΰ������ѤǻȤ���\n"
-"    �顢���������Ǥ������������ե�����̳���������Խ��ʤɤǥޥ���\n"
-"    ��Ȥ����ˤϤ���Ǥ�������ѥ���䳫ȯ�ѤΥ桼�ƥ���ƥ�����\n"
-"    ��ޤ���\n"
+"���줬���Ԥ��뤳�ȤϤޤ�����ޤ��󡣼��Ԥ����ǽ���Ȥ��ƹͤ������\n"
+"�ϡ��ϡ��ɥ��������ȤƤ�Ť��ʤ����������ˤȤ������ȤǤ������������\n"
+"��˥��˲�ǽ�ʺ���β����٤Ǽ�ưŪ��X����ư���ޤ��������ƥ�����ɥ�\n"
+"���ФƤ��ơ����β��̤������뤫�ȳ�ǧ���ޤ���\n"
 "\n"
+"�֥������ѡ��ȡץ��󥹥ȡ���ξ��ˤϡ�X ���ꥦ�������ɤ�����ޤ���\n"
+"���Υ��������ɤˤĤ��ƾܤ����ϡ��ޥ˥奢��򸫤Ƥ���������\n"
 "\n"
-"  - ��ȯ��: ̾���ΤȤ��ꡣ���Υޥ�����˥��եȳ�ȯ�ǻȤ��Τʤ顢\n"
-"    ���������Ǥ��������������������ɤ򥳥�ѥ��롢�ǥХå�������\n"
-"    �����ꡢ���եȥѥå��������ä��ꤹ��Τ˻Ȥ����եȽ������٤�\n"
-"    ���󥹥ȡ��뤵��ޤ���\n"
+"��å������������ơ�����ˡ֤Ϥ��פ��������顢drakX�ϼ��˿ʤߤޤ���\n"
+"��å������������ʤ���С����꤬�ޤ����äƤ���Ȥ������ȤʤΤǡ�����\n"
+"�ƥ��Ȥ�10�äǽ�λ���ơ���Ȥβ��̤����ޤ���"
+
+#: ../../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 ""
+"��ȯ�ܤ��ȡ����ޤ���̤ζ�礬�褯�ʤ����⤷��ޤ���\n"
+"���̤�����������Ȥ��������ˤ���Ƥ���Ȥ��ˡ�������X��������\n"
+"��ư�������ˤǤ⡢DrakX �����꤬Ŭ�ڤ��ɤ��������ơ���ǽ�ʳƼ��\n"
+"�⡼�ɤ�ɽ�����ơ������ʤΤ����٤ȸ����櫓�Ǥ���\n"
 "\n"
-"  - ��������: Linux-Mandrake�򥤥󥹥ȡ��뤷�褦�Ȥ��Ƥ���ޥ����\n"
-"    ���������ѤǻȤ��Ĥ��ʤ餳��Ǥ����ե����륵���� (NFS��SMB)��\n"
-"    �ץ�󥿥����С�Unix��lp (�饤��ץ��) �ץ��ȥ��뤫������ɥ���\n"
-"    ����SMB��ͳ�ΰ����ˡ�ǧ�ڥ����� (NIS)���ǡ����١��������ФʤɤǤ���\n"
-"    ���ξ��ˤϡ�KDE��GNOME�ʤɤΤ�����������ʪ�ϥ��󥹥ȡ��뤷�ޤ���"
+"�Ǹ�μ��ʤȤ��ơ����Ѥ�餺X��ư���ʤ���С֥���ե��å��������ɤ��ѹ���\n"
+"�����ӡְ����ˤʤ������ɡפ����򡢤ɤΥ����Ф�Ȥ��������줿�� FBDev��\n"
+"���Ӥޤ�������ϥե����륻���դ������ǡ��Ƕ�Τ��٤ƤΥ���ե��å���\n"
+"�����ɤǻȤ��ޤ������줫��ֺƥƥ��ȡפ�����ǳ�ǧ���ޤ��礦��"
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:224
 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, 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 ""
+"�Ǹ�ˡ���ư���˥���ե��å��桼�����󥿡��ե��������ۤ�����ʹ����ޤ���\n"
+"������Ƥ��ʤ��Ȥ��Ǥ⡢���μ���ϽФޤ����ޥ���򥵡��ФȤ��ƻȤ���\n"
+"�ǥ����ץ쥤�����꤬���ޤ������ʤ��ä����ˤϡ������ǤϤ������֤�������\n"
+"�������ޤ��礦��"
+
+#: ../../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"
+" * 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"
+"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 ""
+"Mandrake Linux CDROM �ˤϥ쥹���塼�⡼�ɤ��Ȥ߹���Ǥ���ޤ��������\n"
+"�Ȥ��ˤ� CDROM ���鵯ư���ơ���ư���� >>F1<< �����򲡤����ץ���ץȤ�\n"
+">>rescue<< �ȥ����פ��뤳�ȤǤ����Ǥ⡢CDROM���鵯ư�Ǥ��ʤ����ˤϡ�\n"
+"2����ξ��ˤ�������äƤ���ɬ�פ�����Ǥ��礦:\n"
+"\n"
+" * �֡��ȥ������Υ��󥹥ȡ�����ˤϡ�drakX �ϼ�ǥ������Υ֡��ȥ�����\n"
+" (MBR) ��񤭴����ޤ����̤Υ֡��ȥޥ͡������ȤäƤ��ʤ��¤�ˡ�����\n"
+"���뤳�Ȥǡ�������ɥ����� GNU/Linux �Τɤä��Ǥⵯư�Ǥ���褦�ˤʤ�\n"
+"�ޤ��ʥ����ƥ�˥�����ɥ��������äƤ�����ˡ�\n"
+"��������ɥ����򥤥󥹥ȡ��뤷�ʤ����ȡ��ޥ��������եȤΥ��󥹥ȡ���\n"
+"�ץ��������֡��ȥ�������񤭴�����Τǡ�GNU/Linux����ư�Ǥ��ޤ���!\n"
+"\n"
+" * �⤷�������꤬�����ơ��ϡ��ɥǥ��������� GNU/Linux ��ư�Ǥ��ʤ�\n"
+"���ˤϡ�GNU/Linux ��ư����ˤϤ��Υե��åԡ������꤬����ޤ���\n"
+"���Υǥ������ˤϡ����ŤȤ�����äȤ��������ץߥ����ѥ���ɤδְ㤤\n"
+"�ʤɤˤ�륯��å��夫�饷���ƥ�����������Τ˻Ȥ��롢�Ƽ�Υġ���\n"
+"�����äƤ��ޤ���\n"
+"\n"
+"���Υ��ƥåפ򥯥�å�����ȡ��ե��åԡ��ǥ�������ɥ饤�֤��������\n"
+"�׵ᤵ��ޤ���\n"
+"��������ե��åԡ��ǥ������ϡ����������פʥǡ����������äƤ��ʤ����\n"
+"�ˤ��ޤ��礦���ե����ޥåȤ���ɬ�פϤ���ޤ���DrakX�������ˤ����\n"
+"�񤭴����ޤ���"
+
+#: ../../help.pm_.c:255
+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 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"
+"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 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 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"
-"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)."
-msgstr ""
-"DrakX��PCI SCSI�����ץ��򸡽Ф��褦�Ȥ��ޤ���\n"
-"�⤷DrakX��SCSI�����ץ���ߤĤ����ɤΥɥ饤�Ф�Ȥ��Ф��������ΤäƤ���С�\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"
+" * \"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"
-"�⤷SCSI�����ץ����ʤ�����ISA SCSI�����ץ������ޤ���\n"
-"DrakX��ǧ�����ʤ�PCI SCSI�����ץ����ä���硢 SCSI�����ץ��������ƥ�\n"
-"�ˤ��뤫��Ҥͤ��ޤ��������ƥ�˥����ץ����ʤ����\n"
-"�֤������פ򥯥�å����Ƥ��������� �֤Ϥ��פ򥯥�å�����ȡ�\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"
+" * \"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"
-"�⤷��ư�ǥ����ץ�����ꤷ�����ˤϡ�DrakX�ϥ��ץ�������򤷤������ɤ���\n"
-"���䤷�Ƥ��ޤ���DrakX�˥ϡ��ɥ�������ץ����֤����ơ����ץ������ᤵ��\n"
-"�ޤ��礦�������Ƥ�����Ǥ��ޤ�Ư���ޤ���\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"�⤷����ʤ顢�ɥ饤�Ф˼�ʬ�ǥ��ץ�����Ϳ����ɬ�פ�����ޤ���\n"
-"�桼�������ɡ�3�ϡ��֥ϡ��ɥ������ˤĤ��Ƥξ�������סˤ��顢����˴ؤ��\n"
-"�����ϡ��ɤΥޥ˥奢���᡼���� Web �����ȡʥͥåȤ˥��������Ǥ���С�\n"
-"���뤤�ϡʥ����ƥ��ˤ���С�MS Windows ����ɤ���ä�ɬ�׾�������뤫\n"
-"��Ĵ�٤Ƥ���������"
-
-#: ../../help.pm_.c:108
-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"
+" * \"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"
-"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"
+" * \"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 ""
+"���Ƥ���ɤϡ��ϡ��ɥǥ��������Mandrake Linux OS ��ɤ��˥��󥹥ȡ���\n"
+"���뤫���֤��Ȥˤʤ�ޤ����⤷�ϡ��ɥǥ����������������Ǥ��̤� OS ��\n"
+"���ڡ����������ȤäƤ��ޤäƤ����顢�ѡ��ƥ��������ڤäƤ��ɬ�פ�\n"
+"����ޤ�������ǡ��ѡ��ƥ��������ڤ�Ȥ����Τϡ��ϡ��ɥǥ�����������\n"
+"Ū��ʬ�䤷�Ƥ�뤳�ȤǤ���������äơ������� Mandrake Linux �����ƥ��\n"
+"���󥹥ȡ��뤹����ڤ�򤳤��館�Ƥ��櫓�Ǥ���\n"
 "\n"
+"�ѡ��ƥ��������ڤ�Τϡ����ʤ��������꤬�����ޤ��󡣤�����\n"
+"�鿴�ԤˤϤ��ä��ʤ���������줹���ȤǤϤ���ޤ���\n"
+"���Υ��������ɤϥץ��������ñ�ˤ��뤿��Τ�ΤǤ����Ϥ�����ˡ�\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"
+"�������ѡ��ȥ⡼�ɤǥ��󥹥ȡ���򤷤Ƥ����ʤ顢Mandrake Linux \n"
+"�Υѡ��ƥ������ġ��� DiskDrake ����ư���ޤ��������Ȥ��ȡ��ѡ�\n"
+"�ƥ������κ٤������꤬�Ǥ��ޤ����ޥ˥奢��� DiskDrake �ξϤ� \n"
+"���Ȥ��Ƥ����������Ȥ�����Ʊ���Ǥ������󥹥ȡ��륤�󥿡��ե����� \n"
+"����ϡ��������������륦�������ɤ��Ȥ��ޤ�������ˤϡ����󥿡� \n"
+"�ե������ǡ֥��������ɡץܥ���򥯥�å����ޤ��礦��\n"
 "\n"
+"�⤷�ѡ��ƥ�����󤬤��Ǥ��ڤäƤ���ʤ�����˥��󥹥ȡ��뤷���� \n"
+"�Ȥ�����Ȥ����̤Υѡ��ƥ������ġ����Ȥä��Ȥ��ˡ����Ȥ�ñ�� \n"
+"Linux �����ƥ�򥤥󥹥ȡ��뤹��Ф��������Ǥ���\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"
+"�˱����ơ������Ĥ������������ޤ�:\n"
 "\n"
+" * �������ڡ�����Ȥ�������϶����ǥ�������ưŪ�˥ѡ��ƥ�����󤷤� \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"
+"* ��¸�ѡ��ƥ�������Ȥ�: ���������ɤ���¸��Linux �ѡ��ƥ������� \n"
+"�ǥ�������Ǹ��Ĥ��ޤ������⤷�����Ȥ��ʤ顢���Υ��ץ��������Ӥޤ���\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"
+"  Linux �Υǡ����Ѥ˶�����Ĥ���ɬ�פ�����ޤ�������ˤϡ�\n"
+"  ������ɥ�����ä��Ƥ��ޤäƤ⤤���Ǥ����ʾ�Ρ����ǥ������õ��\n"
+"  ���֥������ѡ��ȥ⡼�ɡפ򸫤Ƥ��������ˡ�������ɥ�����\n"
+"  �ѡ��ƥ�������ꥵ����������ˡ�⤢��ޤ����ꥵ�����ξ�硢\n"
+"  �ǡ����Ϥ��٤ƻĤ�ޤ��� Mandrake Linux �ȥ�����ɥ�����Ʊ��\n"
+"  �ޥ���ǻȤ�������Ф��줬������Ǥ���\n"
 "\n"
+"  ������ˡ���������ˡ��������ȥ�����ɥ����Υѡ��ƥ�������\n"
+"  ����꾮�����ʤ�ΤϾ��Τ��Ƥ����Ƥ���������\n"
+"  �Ĥޤꡢ������ɥ����Τۤ��Ǥϡ��ǡ�������¸�����꿷�������եȤ�\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"
+"  �õ�ơ������� Mandrake Linux �Ǿ�񤭤�������С����Υ��ץ�����\n"
+"  ���Ӥޤ��礦�����ξ�硢���Ťˤ��Ƥ������������ä����ǧ�ܥ����\n"
+"  �������顢�⤦���ʤ����Ϥ����ޤ���\n"
 "\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"
 "\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"
+"  ����������Ǥ⤢��ޤ����ǥ�����������ǡ����򤢤ä���ä��Ƥ��ޤ��ޤ���\n"
+"  �褯�褯�狼�ä������Ǥʤ���С���������Фʤ��Ǥ���������"
+
+#: ../../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"
-"\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."
-msgstr ""
-"���Ƥ���ɤϡ��ϡ��ɥǥ��������Linux-Mandrake OS ��ɤ��˥��󥹥ȡ���\n"
-"���뤫���֤��Ȥˤʤ�ޤ����⤷�ϡ��ɥǥ����������������Ǥ��̤� OS ��\n"
-"���ڡ����������ȤäƤ��ޤäƤ����顢�ѡ��ƥ��������ڤäƤ��ɬ�פ�\n"
-"����ޤ�������ǡ��ѡ��ƥ��������ڤ�Ȥ����Τϡ��ϡ��ɥǥ�����������\n"
-"Ū�˶��ڤäƤ�뤳�ȤǤ���������äơ������� Linux-Mandrake �����ƥ��\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"
-"�ѡ��ƥ��������ڤ�Τϡ����ʤ��������꤬�����ޤ��󡣤�����\n"
-"�鿴�ԤˤϤ��ä��ʤ���������줹���ȤǤϤ���ޤ���\n"
-"���Υ��������ɤϥץ��������ñ�ˤ��뤿��Τ�ΤǤ����Ϥ�����ˡ�\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"
-"����Ǥ���ĤΥѡ��ƥ�������פ�ޤ�����Ĥϥ����ƥऽ�Τ���Ѥ�\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"
-"�⤷���Ǥ˥ѡ��ƥ�������������Ƥ���ʤ�ʤ��Ȥ��а����˥��󥹥ȡ���\n"
-"�����Ȥ��̤Υġ����Ȥä��Ȥ��ˡ�Mandrake-Linux�Ǥ����Ȥ��褦����\n"
-"����Ф��ߤޤ���\n"
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
+msgstr ""
+"�ϡ������Ǥ��ޤ��������󥹥ȡ��뤬��λ���ơ�GNU/Linux�����ƥब�Ȥ���\n"
+"�褦�ˤʤ�ޤ����衣OK �򥯥�å�����ȥ����ƥब�Ƶ�ư���ޤ����⤷\n"
+"�ǥ奢��֡��Ȥˤ��Ƥ����顢������ɥ����Ǥ�Linux�Ǥ����٤ޤ���\n"
 "\n"
+"�ֹ��١ץܥ���򲡤��ȡ��������ĥܥ��󤬽ФƤ��ޤ�:\n"
 "\n"
-"�ѡ��ƥ�����󤬤ޤ��������Ƥ��ʤ���С����������ޤ��礦��\n"
-"����ˤϡ�����Ѱդ������������ɤ�ȤäƤ����������ϡ��ɥǥ�����������\n"
-"�˱����ơ������Ĥ������������ޤ�:\n"
+" * ��ư���󥹥ȡ���ե��åԡ�����: �����Ф����ʤ��Ƥ⼫ưŪ�ˡ�\n"
+"���ޤ�ä��ΤȤۤȤ��Ʊ�����󥹥ȡ���򤷤Ƥ����ե��åԡ��������\n"
 "\n"
-"\t* ��¸�ѡ��ƥ�������Ȥ�: ���������ɤ���¸��Linux \t  �ѡ��ƥ�������"
-"�ǥ�������Ǹ��Ĥ��ޤ�����\n"
-"\t  �⤷�����Ȥ��ʤ顢���Υ��ץ��������Ӥޤ���\n"
+"   ���Υܥ���򥯥�å�����ȡ���ĤΥ��ץ�������٤�ޤ�:\n"
 "\n"
+"    * �Ƹ�: ����ϼ�˼�ư���󥹥ȡ���Ǥ����ѡ��ƥ�������ڤ������\n"
+"���÷��ǹԤ��ޤ���\n"
 "\n"
-"\t* �ǥ��������Τ�õ�: �ϡ��ɥɥ饤�־�����ǡ�����ѡ��ƥ�������\n"
-"\t  �õ�ơ������� Linux-Mandrake �Ǿ�񤭤�������С����Υ��ץ�����\n"
-"\t  ���Ӥޤ��礦�����ξ�硢���Ťˤ��Ƥ������������ä����ǧ�ܥ����\n"
-"\t  �������顢�⤦���ʤ����Ϥ����ޤ���\n"
+"    * ��ư��: �����˼�ư�����줿���󥹥ȡ���Ǥ����ϡ��ɥǥ�������\n"
+"�����˾�񤭤���ƥǡ����������ä��ޤ���\n"
 "\n"
+"   �����褦�ʥޥ���¿���˥��󥹥ȡ��뤹��Ȥ��ˤϤȤƤ������Ǥ���\n"
+"���ҤΥ����֥����Ȥǡ�Auto install �ι�򸫤Ƥ���������\n"
 "\n"
-"\t* ������ɥ����ζ�����ʬ��Ȥ�: �ϡ��ɥǥ������˥�����ɥ�����\n"
-"\t  ���󥹥ȡ��뤵��Ƥ��ơ��ǥ��������Τ�ȤäƤ���ʤ顢\n"
-"\t  Linux �Υǡ����Ѥ˶�����Ĥ���ɬ�פ�����ޤ�������ˤϡ�\n"
-"\t  ������ɥ�����ä��Ƥ��ޤäƤ⤤���Ǥ����ʾ�Ρ����ǥ������õ��\n"
-"\t  ���֥������ѡ��ȥ⡼�ɡפ򸫤Ƥ��������ˡ�������ɥ�����\n"
-"\t  �ѡ��ƥ�������ꥵ����������ˡ�⤢��ޤ����ꥵ�����ξ�硢\n"
-"\t  �ǡ����Ϥ��٤ƻĤ�ޤ��� Linux-Mandrake �ȥ�����ɥ�����Ʊ��\n"
-"\t  �ޥ���ǻȤ�������Ф��줬������Ǥ���\n"
+" * �ѥå������������¸(*): ����������ѥå������Υꥹ�Ȥ���¸��\n"
+"�������Ƥ����ȡ��̤Υ��󥹥ȡ�����ˤ�ɥ饤�֤ˤ��Υե��åԡ���\n"
+"����ơ��إ�ײ��� F1 �� >>linux defcfg=\"floppy\"<<���Ǥ��ߤޤ���\n"
 "\n"
+"(*) FAT �����Υե��åԡ���ɬ�ס�GNU/Linux �Ǻ��ˤ�\"mformat a:\"\n"
+"�ȥ����פ��ޤ���)"
+
+#: ../../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"
-"\t  ������ˡ���������ˡ��������ȥ�����ɥ����Υѡ��ƥ�������\n"
-"\t  ����꾮�����ʤ�ΤϾ��Τ��Ƥ����Ƥ���������\n"
-"\t  �Ĥޤꡢ������ɥ����Τۤ��Ǥϡ��ǡ�������¸�����꿷�������եȤ�\n"
-"\t  ���󥹥ȡ��뤹��Ȥ��ˡ��Ȥ�����������ʤ��ʤ�櫓�Ǥ���\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"
-"\t* �������ѡ��ȥ⡼��: �ϡ��ɥǥ��������ư�ǥѡ��ƥ�����󤷤�����С�\n"
-"\t  ���Υ��ץ��������Ӥޤ��礦���Ǥ⡢���դ��Ƥ������������Ϥʤ����ˡ�\n"
-"\t  ����������Ǥ⤢��ޤ����ǥ�����������ǡ����򤢤ä���ä��Ƥ��ޤ���"
-"����\n"
-"\t  �褯�褯�狼�ä������Ǥʤ���С���������Фʤ��Ǥ���������"
-
-#: ../../help.pm_.c:160
-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"
+"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"
-"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"
+"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"
-"To partition the selected hard drive, you can use these options:\n"
+"�����ǡ���¸�Υѡ��ƥ�������ե����ޥåȤ��ơ���ȤΥǡ�����õ�\n"
+"���Ƥ������Ȥ�Ǥ��ޤ������ξ��ˤϡ��ե����ޥåȤ������ѡ��ƥ������\n"
+"������Ǥ����Ƥ���������\n"
 "\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
+"�̤˴�¸�Υѡ��ƥ�������̵���˥ե����ޥåȤ���ɬ�פϤ���ޤ���\n"
+"OS �����ä��ѡ��ƥ������ʤ��Ȥ��С�/�ס�/usr�ס�/var�פʤɡˤ�\n"
+"�ե����ޥåȤ�ɬ�פǤ������ȤäƤ��������ǡ��������ä�\n"
+"�ѡ��ƥ��������̾�ϡ�/home�סˤϤ��ΤޤޤǤ������礦�֤Ǥ���\n"
 "\n"
+"�ѡ��ƥ���������Ӥˤ����դ��ޤ��礦���ե����ޥåȤ����顢�ǡ�����\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"
+"�ѡ��ƥ������Υե����ޥåȤ򳫻Ϥ���ˤϡ�OK�פ򥯥�å����ޤ���\n"
 "\n"
+"¾�Υѡ��ƥ�����������Ǥ������Mandrake Linux OS �������ʤ顢\n"
+"�֥���󥻥�פ򥯥�å����Ƥ���������\n"
+"���ɥ֥��å��Υ����å��򤷤�����Сֹ��٤�����פ򥯥�å����ޤ���"
+
+#: ../../help.pm_.c:376
+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 ""
+"������ Mandrake Linux os �򥤥󥹥ȡ�����Ǥ������Ф餯���֤�\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 ""
+"��˿ʤ����˥饤���󥹾��򿵽Ť��ɤ�Ǥ�������������� Mandrake Linux\n"
+"���Τ򥫥С������ΤǤ�����ĤǤ�Ʊ�դǤ��ʤ���ब����С��ֵ��ݡ�\n"
+"�򲡤��Ƥ�������������ȥ��󥹥ȡ��뤬�����˽����ޤ������󥹥ȡ����\n"
+"³����ˤϡ���Ʊ�դ���ץܥ���򲡤��Ƥ���������"
+
+#: ../../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"
-"   * Undo: you can use this option to cancel your changes.\n"
+"If you do not know what to choose, keep the default option."
+msgstr ""
+"���ơ�����ɤϤ��Υޥ���˵��륻�����ƥ����������ʳ��Ǥ�����§�Ȥ���\n"
+"�ޥ��󤬳����ˤ��餵��Ƥ����ٹ礤���⤤�ۤɡ������ƥޥ�����Υǡ����ν���\n"
+"�����⤤�ۤɡ��������ƥ�����⤯���ޤ���\n"
+"�Ǥ⡢�⤤�������ƥ��ϡ����̤˥ޥ���λȤ��䤹�������ˤ��ޤ���\n"
+"�ƿ��ˤĤ��ƾܤ����ϡ���ե���󥹥ޥ˥奢��� MSEC �ξϤ򻲾ȤΤ��ȡ�\n"
 "\n"
+"�������٤Ф������狼��ʤ���С��ǥե���ȤΤޤޤˤ��Ƥ����ޤ��礦��"
+
+#: ../../help.pm_.c:401
+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 ""
-"���Ƥ����ǡ������� Linux-Mandrake �����ƥ��\n"
+"���Ƥ����ǡ������� Mandrake Linux �����ƥ��\n"
 "���󥹥ȡ���ˤɤΥѡ��ƥ�������Ȥ������ꤷ�ޤ����⤷\n"
 "�ѡ��ƥ����������Ѥߤʤ������ GNU/Linux �򥤥󥹥ȡ��뤷��\n"
 "���Ȥ����ä����̤Υġ����Ȥä��ꤷ�����ˡ�����򤽤Τޤ޻Ȥ�\n"
 "���Ȥ�Ǥ��ޤ�������ʳ��ϡ��ѡ��ƥ�����������ɬ�פǤ���\n"
 "\n"
-"\n"
 "�ѡ��ƥ�������Ĥ���ˤϡ��ޤ��ϡ��ɥǥ����������Ӥޤ����⤷\n"
 "�ǽ�� IDE �ɥ饤�֤����֤ʤ��hda�ס������ܤ� IDE �ʤ��hdb�ס�\n"
 "�ǽ�� SCSI �ǥ������ʤ��sda�פȤ������˥���å��������Ӥޤ���\n"
 "\n"
-"\n"
 "�ϡ��ɥǥ������Υѡ��ƥ��������ڤ�ˤϡ��ʲ��Υ��ץ���󤬻Ȥ��ޤ�:\n"
 "\n"
 "   * ���õ�: ������ϡ��ɥǥ�����������ѡ��ƥ�������õ�ޤ���\n"
 "\n"
-"\n"
 "   * ��ư�������: �ϡ��ɥǥ������ζ�����ʬ�ˡ���ưŪ�� Ext2 ��\n"
 "     ����åץѡ��ƥ�������Ĥ���ޤ���\n"
 "\n"
-"\n"
 "   * �ѡ��ƥ������ơ��֥뽤��: �ѡ��ƥ������ơ��֥뤬�˲�����\n"
 "     ���顢���Υ��ץ����Ǥ���������Ƥߤ뤳�Ȥ��Ǥ��ޤ���\n"
 "     ���Ť˻Ȥäơ����줬��ǽ�Ǥʤ����ȤϾ��Τ��Ƥ����Ƥ���������\n"
 "\n"
-"\n"
 "   * ���ä�: �ѹ�����ä��ޤ���\n"
 "\n"
-"\n"
 "   * �������: �ѹ����������ä��ơ���ȤΥѡ��ƥ������ơ��֥���ɤ߹��ߤ�"
 "����\n"
 "\n"
-"\n"
 "   * ����������: �ϡ��ɥǥ������Υѡ��ƥ�����󥦥������ɤ�Ȥ��Ȥ���\n"
 "     ���ץ����Ǥ����ѡ��ƥ������ˤĤ��Ƥ��μ����ʤ��ͤϡ����줬\n"
 "     ������Ǥ���\n"
 "\n"
-"\n"
 "   * �ե��åԡ��������: �����Υ��󥹥ȡ���ǡ��ѡ��ƥ������ơ��֥��\n"
 "     �ե��åԡ�����¸����Ǥ��������Ǥ��ޤ���\n"
 "\n"
-"\n"
 "   * �ե��åԡ�����¸: �����Ѥ˥ѡ��ƥ������ơ��֥��ե��åԡ���\n"
 "     ��¸�������Ȥ��˻Ȥ��ޤ��������Ȥ��褦���������ᤷ�ޤ���\n"
 "\n"
-"\n"
 "   * ��λ: �ϡ��ɥǥ������Υѡ��ƥ�������ڤ꤬����ä��顢���Υ��ץ�����\n"
 "     �Ȥä��ѹ�����¸���ޤ���\n"
 "\n"
-"\n"
 "���ͤޤǤˡ������ܡ��ɤ���ƥ��ץ�������٤ޤ������֤Ⱦ岼�����Ȥä�\n"
 "�ѡ��ƥ����������Ӥޤ��礦��\n"
 "\n"
-"\n"
 "�ѡ��ƥ�������������顢�ʲ����Ȥ��ޤ�:\n"
 "\n"
 "     * Ctrl-c�������ѡ��ƥ�������Ĥ���ʶ��Υѡ��ƥ�������������Ȥ�)\n"
@@ -2377,173 +2921,50 @@ msgstr ""
 "\n"
 "     * Ctrl-m���ޥ���ȥݥ���Ȥ򥻥å�\n"
 "\n"
-"           \n"
 "PPC �ޥ���˥��󥹥ȡ��뤷�Ƥ�����ˤϡ�yaboot �֡��ȥ������Ѥˡ����� 1 MB "
 "�ξ����� HFS�֥֡��ȥ��ȥ�åסץѡ��ƥ���������ޤ��礦��\n"
 "���Υѡ��ƥ������򡢤��Ȥ��� 50 MB �Ȥ��礭��ˤ��Ƥ����ȡ�������ͽ���Υ���"
-"�ͥ��ramdisk ���᡼������¸���Ƥ����ơ��۵޵�ư�˻Ȥ��������Ǥ���"
+"�ͥ��ramdisk ���᡼������¸���Ƥ����ơ��۵޵�ư�˻Ȥ��������Ǥ���"
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:460
 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"
+"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"
-"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"
+"\"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..."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
-"�ϡ��ɥǥ�������˸��Ф��줿����¸�� Linux �ѡ��ƥ���������\n"
-"�����ޤ������������ɤ�����򤽤Τޤޤˤ��Ƥ����Ƥ⤤���Ǥ��礦��\n"
-"�̾�����Ѥˤ����ꤢ��ޤ���������Ѥ����顢����Ǥ� root\n"
-"�ѡ��ƥ������ʡ�/�סˤ���ꤷ�Ƥ������������ޤ꾮�����ѡ��ƥ������\n"
-"�򤳤������֤ȡ����եȤ������ڤ�ʤ��ʤ�ޤ��衣�ޤ����ǡ������̤�\n"
-"�ѡ��ƥ������˵���������С���/home�פ���ꤷ�ޤ��礦�ʤ���ϡ�\n"
-"Linux �ѡ��ƥ������ʣ���ʤ����Բ�ǽ�Ǥ����ˡ�\n"
-"\n"
-"\n"
-"���ʤߤ˳ƥѡ��ƥ������ϰʲ��ν񼰤ǵ󤬤äƤ��ޤ�: ��̾���ס����̡�\n"
-"\n"
-"\n"
-"��̾���פϼ��ν񼰤Ǥ�: �֥ϡ��ɥǥ���������ס֥ɥ饤���ֹ��\n"
-"�֥ѡ��ƥ�������ֹ�סʤ��Ȥ��С�hda1��)\n"
-"\n"
-"\n"
-"�֥ϡ��ɥǥ���������פϡ�IDE �ǥ������ʤ��hd�פǡ�SCSI �ʤ��sd��\n"
-"�Ǥ���\n"
-"\n"
-"\n"
-"�֥ɥ饤���ֹ�פϡ���hd�פ��sd�פθ�ˤĤ�ʸ���Ǥ���IDE�ʤ�:\n"
-"\n"
-"   * ��a�פϥץ饤�ޥꥳ��ȥ������Υޥ����ǥ�����\n"
-"\n"
-"   * ��b�פϥץ饤�ޥꥳ��ȥ������Υ��졼�֥ǥ�����\n"
-"\n"
-"   * ��c�פϥ��������IDE����ȥ������Υޥ����ǥ�����\n"
-"\n"
-"   * ��d�פϥ��������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 ""
-"������ Linux-Mandrake �ѡ��ƥ������Υ��󥹥ȡ����Ѥ˾õ����\n"
-"�ϡ��ɥǥ�����������Ǥ������������Υϡ��ɥǥ�������Υǡ���������\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"
-"�õ��ʤ��OK�פ򥯥�å����Ƥ�����������OK�פ򥯥�å������顢\n"
-"���Υϡ��ɥǥ�������˺�����ǡ�����ѡ��ƥ������ϡ�������ɥ���\n"
-"�Τ�Τ�ޤᡢ���٤ƾõ��Ʋ����Բ�ǽ�ˤʤ�ޤ���\n"
-"\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"
-"Linux-Mandrake OS �Υ��󥹥ȡ����Ѥ˥ꥵ������������Τ������\n"
+"������ɥ����Υѡ��ƥ�����󤬤����Ĥ��ϡ��ɥǥ�������˸��Ĥ���ޤ�����\n"
+"Mandrake Linux OS �Υ��󥹥ȡ����Ѥ˥ꥵ������������Τ������\n"
 "����������\n"
 "\n"
+"�ƥѡ��ƥ������ϰʲ��ν񼰤Ǥ�: ��Linux̾�ס֥�����ɥ���̾�ס����̡�\n"
 "\n"
-"���ʤߤ˳ƥѡ��ƥ������ϰʲ��ν񼰤ǵ󤬤äƤ��ޤ�: ��̾���ס֥�����ɥ���"
-"̾�ס����̡�\n"
-"\n"
-"\n"
-"��̾���פϼ��ν񼰤Ǥ�: �֥ϡ��ɥǥ���������ס֥ɥ饤���ֹ��\n"
+"��Linux ̾�פϼ��ν񼰤Ǥ�: �֥ϡ��ɥǥ���������ס֥ɥ饤���ֹ��\n"
 "�֥ѡ��ƥ�������ֹ�סʤ��Ȥ��С�hda1��)\n"
 "\n"
 "\n"
@@ -2562,889 +2983,580 @@ msgstr ""
 "   * ��d�פϥ��������IDE����ȥ������Υ��졼�֥ǥ�����\n"
 "\n"
 "\n"
-"SCSI �ϡ��ɥǥ������ξ�硢��a�פϥץ饤�ޥꡢ��b�פϥ�������ꡢ�Ȥ�������"
-"��\n"
-"\n"
+"SCSI �ϡ��ɥǥ������ξ�硢��a�פ�SCSI ID�ֹ�Ǿ��Υǥ�������\n"
+"��b�פϤ��μ���ID�ֹ桢�Ȥ������Ǥ�\n"
 "�֥�����ɥ���̾�פϡ�������ɥ����ǤΥɥ饤��ʸ���Ǥ��ʺǽ�Υǥ�����\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
 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"
-"\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"
-"\n"
-"\n"
-"�����ǡ���¸�Υѡ��ƥ�������ե����ޥåȤ��ơ���ȤΥǡ�����õ�\n"
-"���Ƥ������Ȥ�Ǥ��ޤ������ξ��ˤϡ��ե����ޥåȤ������ѡ��ƥ������\n"
-"������Ǥ����Ƥ���������\n"
-"\n"
+"DrakX�Ϥ���ɤϡ��ɤ�ʼ���Υ��󥹥ȡ���򤷤������Ҥͤޤ����ǥե����\n"
+"�ʿ侩�˥��󥹥ȡ��뤫����äȥ���ȥ����뤷�������ʡ֥������ѡ��ȡס�\n"
+"�Ǥ����ޤ��������󥹥ȡ��뤫��¸��Mandrake Linux�򹹿�����Τ������٤ޤ���\n"
+"�֥��󥹥ȡ���פ򥯥�å�����ȸŤ������ƥ�Ϥ��٤ƾä��ޤ��������䡢\n"
+"��¸�����ƥ�ν����ʤ�֥��åץ��졼�ɡʹ����ˡפ����Ӥޤ���\n"
 "\n"
-"�̤˴�¸�Υѡ��ƥ�������̵���˥ե����ޥåȤ���ɬ�פϤ���ޤ���\n"
-"�Ǥ⡢OS �����ä��ѡ��ƥ������ϥե����ޥåȤ�ɬ�פǤ��ʤ��Ȥ���\n"
-"��/�ס�/usr�ס�/var�פʤɡˤ����ȤäƤ��������ǡ��������ä�\n"
-"�ѡ��ƥ��������̾�ϡ�/home�סˤϤ��ΤޤޤǤ������礦�֤Ǥ���\n"
+"Mandrake Linux�ε��Ǥ����󥹥ȡ��뤵��Ƥ��ʤ�����ʣ���� OS���¹�\n"
+"���ƻȤ����ˤϡ��֥��󥹥ȡ���פ����Ӥޤ��礦��\n"
 "\n"
+"�Ť�Mandrake Linux�򹹿��������Τʤ�ֹ����פ����Ӥޤ���\n"
 "\n"
-"�ѡ��ƥ���������Ӥˤ����դ��ޤ��礦���ե����ޥåȤ����顢�ǡ�����\n"
-"�����õ��ơ����٤Ȳ����Ǥ��ޤ���\n"
+"GNU/Linux �ؤν����٤˱����ơ��ʲ��Υ��󥹥ȡ��롦������٥뤬\n"
+"���٤ޤ�:\n"
 "\n"
+"* �侩: GNU/Linux  �Υ��󥹥ȡ��뤬���Ƥʤ餳�������Ǥ���������\n"
+"���뤵������⤢�ޤ�ʤ����ȤƤ��ñ�˥��󥹥ȡ���Ǥ��ޤ���\n"
 "\n"
-"�ѡ��ƥ������Υե����ޥåȤ򳫻Ϥ���ˤϡ�OK�פ򥯥�å����ޤ���\n"
+"* �������ޥ���: GNU/Linux �Τ��Ȥ�褯�ΤäƤ���ͤϡ������ƥ��\n"
+"��ʻȤ���������Ǥ��������ʥ�����ơ�����󡢥����С���ȯ�ˡ�\n"
+"�ֿ侩�פ��Ϥ����������������뤳�Ȥˤʤ�Τǡ����Υ��饹��\n"
+"���֤ˤ� GNU/Linux �λ��ȤߤˤĤ����μ�������ޤ���\n"
 "\n"
-"\n"
-"¾�Υѡ��ƥ�����������Ǥ������Linux-Mandrake OS �������ʤ顢\n"
-"�֥���󥻥�פ򥯥�å����Ƥ���������"
+"* �������ѡ���: GNU/Linux �˾ܤ����ͤϡ����Υ��󥹥ȡ��륯�饹��\n"
+"���٤ޤ����֥������ޥ����פ�Ʊ������������ӡʥ�����ơ������\n"
+"�����С���ȯ�ˤ����٤ޤ������Υ��󥹥ȡ��륯�饹����������\n"
+"�褯�ͤ��Ƥ��������������ƥ������ಽ�������󥹥ȡ��뤬�Ǥ��ޤ���\n"
+"GNU/Linux�ˤĤ��Ƥ�ۤɾܤ����ʤ��ȡ��ʤ��ʤ��������ʤ����䤬\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"
-"\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"
+"�դĤ���drakX�Ϥ��ʤ��Ѥ������������ܡ��ɤ�ưŪ�����Ӥޤ��ʸ��������\n"
+"���Ȥ�Ƚ�Ǥ��ޤ��ˡ������餳�Υ��ƥåפϤդĤ��ϽФƤ��ޤ��󡣤�����ʬ\n"
+"�θ���ˤ��ä����б����������ܡ��ɤ�ȤäƤ��ʤ����⤷��ޤ��󡣤��Ȥ���\n"
+"�Ѹ���ä��������ͤʤ顢�����ܡ��ɤϥ��������Τۤ��������Ȼפ����⤷���\n"
+"���󡣤��뤤�ϱѸ�Ĥ����Ǥ⥱�٥å��߽��ʤ顢���������ˤʤ�Ǥ��礦��\n"
+"������ξ��Ǥ⡢���Υ��󥹥ȡ����ʳ�����äơ���������Ŭ�ڤʥ����ܡ���\n"
+"������Ǥ���������\n"
 "\n"
-"������顢DrakX �Τۤ��ǡ�����򥤥󥹥ȡ��뤹�������;͵�����뤫\n"
-"�����å����ޤ������ʤ�ٹ��Ф��ޤ�������Ǥ�³��������С�DrakX\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"
+"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 ""
-"�����Ǥϥ��󥹥ȡ��뤷�����ѥå���������̤����٤ޤ���\n"
-"\n"
-"\n"
-"�ѥå�����������ɥ��κ����ߤˤ��륪�ץ����򥯥�å�����ȡ��ĥ꡼��\n"
-"�ΤФ�����̤᤿��Ǥ��ޤ���\n"
-"\n"
+"���󥹥ȡ���ȥ����ƥ����ѤǻȤ����������Ǥ���������\n"
 "\n"
-"�ѥå������� abc ����¤��ؤ�������С���abc��ȥ��롼�׽��ڤ��ؤ���\n"
-"��������򥯥�å����Ƥ���������\n"
+"�ֹ��٤�����ץܥ���ǡ��ۤ��θ�������٤ޤ�������ϥޥ�������äơ����\n"
+"ɬ�פ˱����ƻȤ��ޤ������Ȥ��Ф��Υޥ���򥹥ڥ���οͤˤ�ȤäƤ�餦��\n"
+"�顢�ĥ꡼ɽ���μ��׸���ˤϱѸ������ǡ��ֹ��٤�����פǥ��ڥ����/��\n"
+"�ڥ�����б�����ܥå����˥����å�������ޤ���\n"
 "\n"
-"\n"
-"��¸�ط��ˤĤ��Ƥηٹ𤬤���ʤ���С��ְ�¸�ط���ư�����פ�\n"
-"����å����Ƥ�����������������֤ȡ�����ѥå�������������\n"
-"�����顢����˰�¸����ѥå���������ޤäƲ������ޤ���"
+"�����ʣ�����٤ޤ����ɲäθ���ʥ�������ˤ�����ǡ�OK�򲡤��Ƴ�ǧ�����顢\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 ""
-"�嵭�ΰ�����CD�����٤Ƥ����äƤ���С�Ok�򥯥�å����ޤ��礦��\n"
-"CD����Ĥ�ʤ���С�����󥻥�򥯥�å����Ƥ���������\n"
-"�긵�ˤʤ�CD������С���������򤫤�Ϥ����Ƥ���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 os �򥤥󥹥ȡ�����Ǥ������Ф餯���֤�\n"
-"������ޤ��ʥ��󥹥ȡ��뤹�륵�����ȥ���ԥ塼����®�٤ˤ���ޤ��ˡ�\n"
+"�ǥե���Ȥ��ȡ�DrakX �ϣ��ܥ���ޥ��������ꤷ�ơ�����ܥ���򥨥ߥ�졼��\n"
+"��������ˤʤäƤ��ޤ���DrakX �ϡ����줬PS/2�ޥ�����USB�ޥ�������ưȽ��\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"
-"�ɥ饤�Ф�����ľ���Ƥ���������"
+"�ǥե���Ȱʳ��Υޥ�����������顢�ޥ����Υƥ��Ȳ��̤��ФƤ��ޤ���\n"
+"�ܥ����ۥ������ȤäƤߤơ���������Ǥ��������ǧ���ޤ��礦�����ޤ�\n"
+"ư���ʤ���С����ڡ������֥꥿����פ򲡤��ƥ���󥻥뤷�ơ����Ӥʤ���\n"
+"�ޤ���"
 
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:560
 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 ""
 "�������ݡ��Ȥ�����Ǥ������������Ȥ��С�MS ������ɥ����Ǥ�\n"
 "COM1�ݡ��Ȥϡ�GNU/Linux�Ǥ� 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 ""
-"�ޥ���򥤥󥿡��ͥåȤ� LAN �ˤĤʤ������ʤ顢�б�����\n"
-"���ץ���������Ǥ������������������ץ������������ˡ����ΥǥХ���\n"
-"���Ÿ��򤤤�ơ�DrakX �˼�ư���Ф����Ƥ���������\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"
-"���󥿡��ͥåȤ� LAN ����³���ʤ��ʤ顢�֥ͥåȥ����Ȥ�ʤ��פ�\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"
+"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 ""
-"��ǥब���ФǤ��ޤ��󡣥�ǥ�ΤĤʤ��äƤ��륷�ꥢ��ݡ��Ȥ�\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"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
-"���ͤޤǤˡ��ǽ�Υ��ꥢ��ݡ��ȡʥ�����ɥ����Ǥϡ�COM1�סˤϡ�\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 ""
-"����������륢�åפ�����򤷤ޤ����������Ϥ��Ƥ������狼��ʤ���\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 ""
-"��ǥब���դ��ʤ顢�����Ÿ�������ơ�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"
-"�狼��ʤ���С�����������򥤥󥿡��ͥåȤΥץ��Х�����ISP) ��\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"
-"�������Ϥ��Ƥ������狼��ʤ���С�ISP������������򶵤�äƤ���������"
-
-#: ../../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 ""
-"����Ǥϥͥåȥ���ǥХ��������ꤷ�ޤ��礦:\n"
-"\n"
-"  - IP ���ɥ쥹: �狼��ʤ���С��ͥåȥ�������Ԥˤ����Ƥ���������\n"
-"    ���ǡּ�ư IP�� ���ץ��������֤ʤ顢���Ϥ��ʤ��Ǥ�������\n"
-"\n"
-"  - �ͥåȥޥ���: ��255.255.255.0�פˤ��Ƥ����Τ�̵��Ǥ����������ʤ����\n"
-"�ͥåȥ�������Ԥˤ����Ƥ���������\n"
-"\n"
-"\n"
-"  - ��ư IP: �ͥåȥ���� BOOTP �� DHCP �ץ��ȥ����ȤäƤ�����\n"
-"���Υ��ץ���������Ǥ�����������������֤ȡ���IP ���ɥ쥹�פ����\n"
-"����ɬ�פϤ���ޤ��󡣼������ʤ���С��ͥåȥ�������Ԥˤ�����\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 ""
-"�Ǥϥ�����륢�åפ�����򤷤ޤ����������Ϥ��Ƥ������狼��ʤ���С�\n"
-"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 ""
-"�ץ�������Ȥ��ʤ顢���������ꤷ�ޤ��礦���ץ�������Ȥ����ɤ���\n"
-"�狼��ʤ���С��ͥåȥ�������Ԥ�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 ""
-"���󥿡��ͥå���³�����꤬��������С������ǰŹ�ѥå������򥤥󥹥ȡ���\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\"."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"��ʬ�ν���Ǥ�������Ӥ����Ӥޤ���\n"
+"������GNU/Linux�����ƥ�Υ������ƥ���ǰ��֤Υ���ˤ�äƤ��ޤ�����\n"
+"root �ѥ���ɤ�����Ǥ���root �ϥ����ƥ�����Ԥǡ������ƥ�򹹿���\n"
+"���ꡢ�桼�����ɲä����ꡢ�����ƥ����Τ�������Ѥ�����Ǥ���ͣ���¸��\n"
+"�Ǥ���root �Ϥ��Υ����ƥ�Ǥ���ǽ�ʤΤǤ���\n"
+"�����餳����¾�ͤ˿�¬����ʤ��ѥ�������Ӥ�ɬ�פǤ�����ñ��������\n"
+"drakX ���ٹ𤷤ޤ��������Ǽ����褦�ˡ��ѥ���ɤ����Ϥ��ʤ����Ȥϲ�ǽ\n"
+"�Ǥ������Ǥ����ꤹ�뤳�Ȥ򶯤������ᤷ�ޤ����������٤���ͳ����ġ�\n"
+"GNU/Linux ��ư��������Ȥ��äơ��ۤ��Υ��ڥ졼�ƥ��󥰥����ƥब\n"
+"�����äƤ�̵���Ȼפä��㤤���ʤ����Ȥ������ȤǤ���root�ʤ餢����\n"
+"���¤����ˤ��ơ��ѡ��ƥ�����󤽤Τ�Τ򥢥��������ơ����ǥ�������\n"
+"�ǡ����򤦤ä��������Ƥ��ޤ��ޤ��� �����顢root�ˤʤ�ΤϤऺ������\n"
+"���Ƥ����Τ�����Ǥ���\n"
 "\n"
+"�ѥ���ɤϡ�����ե��٥åȤȿ����򺮤�����Τǡ�����Ǥ�8ʸ����\n"
+"ɬ�פǤ����褷�ƽ�α�᤿�ꤷ�ʤ��Ǥ���������\n"
 "\n"
-"Linux �ϻ��֤�GMT���Ĥޤ�֥���˥å�ɸ����פǴ������Ƥ��ơ������\n"
-"���ʤ�������������Ӥˤ��碌���Ѵ����ޤ���\n"
+"�ѥ���ɤϡ�Ĺ���������䤳���������ꤷ�Ƥ⤤���ޤ��󡣳ڤ˳Ф�\n"
+"�Ƥ������Τˤ��ޤ��礦��\n"
 "\n"
+"�ѥ���ɤ�������Ϥ��ޤ������ΤȤ��ˤޤ������򤹤�ȡ��ޤ����ä�\n"
+"��Τ���Ͽ����Ƥ��ޤ��Τǡ����ä����Ȥˤʤ�ޤ���\n"
 "\n"
-"���Υޥ���ǥ�����ɥ�����ȤäƤ���Ȥ��ˤϡ�No�פ�����Ǥ�������"
+"��������ͥåȥ��������ˤ�äƤϡ�NIS ��Ȥ����⤷��ޤ���\n"
+"�狼��ʤ���Х����ƥ�����Ԥˤ����Ƥ���������NIS��Ȥ����ˤ�\n"
+"��NIS��Ȥ��ץ��ץ��������Ӥޤ�����OK�פ򲡤����顢ɬ�פʾ���\n"
+"�����Ϥ��ޤ���"
 
-#: ../../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 ""
-"�ޥ���ε�ư���˼�ưŪ�˳��Ϥ����������ӥ������Ӥޤ��礦��\n"
-"\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
-"���ܤξ�˥ޥ������äƤ���ȡ����줬���Υ����ӥ�����������\n"
-"�����ʿ᤭�Ф����ФƤ��ޤ���\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"
-"���Υޥ���򥵡��Фˤ���Ĥ��ʤ顢�����Ǥ��ä˵���Ĥ��ޤ��礦��\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, MS Windows �Υͥåȥ����ͳ�Τ�ΡˤǤ�\n"
-"���ޤ��ޤ���"
-
-#: ../../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 ""
-"�����Ǥ���褦�ˤ������ʤ�С�CUPS �� LPR�Τɤ��餫�ΰ��������ƥ��\n"
-"����Ǥ���������\n"
+"LILO �� GRUB �� GNU/Linux �ε�ư�˻Ȥ���֡��ȥ������Ǥ��������ʳ���\n"
+"�դĤ��������˼�ư������Ƥ��ޤ���DrakX�ϥǥ������Υ֡��ȥ�������ʬ�Ϥ���\n"
+"���η�̤˱������б�����褦�ˤ��ޤ�:\n"
 "\n"
+" * �⤷������ɥ����Υ֡��ȥ�����������С������ GRUB/LILO �֡���\n"
+"�������˽񤭴�����졢GNU/Linux �� Windows��ξ������ư��ǽ�ˤʤ�;\n"
 "\n"
-"CUPS �Ͽ����������Ϥǽ���� Unix �Ѱ��������ƥ�Ǥ� (CUPS�Ȥ����Τ�\n"
-"��Common Unix Printing System�פ�ά)��Linux-Mandrake�ǤϤ��줬�ǥե����\n"
-"�Ǥ���\n"
+" * �⤷ GRUB �� LILO �֡��ȥ����������Ĥ���С��ǿ��Ǥ˹���;\n"
 "\n"
+"�狼��ʤ���С�drakX �ϳƼ索�ץ�����󤲤�������������ɽ�����ޤ���\n"
 "\n"
-"LPR �ϸŤ����������ƥ�ǡ��Τ� Linux-Mandrake �ǻȤäƤ��ޤ�����\n"
+" * �Ȥ��֡��ȥ�����: ������3�Ĥ���ޤ�:\n"
 "\n"
+"    * LILO������ե��å���˥塼�Ĥ�: ����ե��å���˥塼�Ĥ��� LILO ���褱"
+"��Ф����\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"
+"    * Grub: GRUB (�ƥ����ȥ�˥塼)�ξ�硣\n"
 "\n"
+"    * LILO �ƥ����ȥ�˥塼: �ƥ����ȥ�˥塼�Ĥ� LILO �ξ�硣\n"
 "\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
+" * �֡��ȥǥХ���: �ۤȤ�ɤϡ��ǥե���� (/dev/hda) �ΤޤޤǤ���\n"
+"���ˤ�äƤϥ֡��ȥ������������ܤΥϡ��ɥǥ����� (/dev/hdb)�䡢\n"
+"�ե��åԡ��ǥ��������֤��ޤ� (/dev/fd0)��\n"
 "\n"
+" * �ǥե���ȥ��᡼����ư���Ԥ�����: ����ԥ塼����Ƶ�ư�����Ȥ���\n"
+"�֡��ȥ������Υǥե���Ȱʳ��Υ�˥塼�����֤���λ��֤���ꤷ�ޤ���\n"
 "\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
+"!! �֡��ȥ������򥤥󥹥ȡ��뤷�ʤ��ȡʤ����ǡ֥���󥻥�פ������\n"
+"���ˡ��ۤ���Mandrake Linux��ư������ˡ����ݤ���Τ�˺��ʤ���\n"
+"����������\n"
+"�ޤ��������ǤΥ��ץ������Ѥ���Τϡ����ΰ�̣��ʬ���äƤ���ͤ�����\n"
+"���Ƥ������� !!\n"
 "\n"
+"���Υ����������ǡֹ��٤�����ץܥ���򲡤��ȡ����٤ʥ桼�����Ѥ�\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"
+"Mandrake Linux ���ȼ��Υ֡��ȥ������򥤥󥹥ȡ��뤷�ޤ��������\n"
+"GNU/Linux �Ǥ⤽��¾�����ƥ��Τ��٤Ƥ� OS �Ǥⵯư�Ǥ��ޤ���\n"
 "\n"
-"\n"
-"�⤷�ץ�󥿤��ޥ����ľ�ܤĤʤ��äƤ���ʤ顢�֥�������ץ�󥿡פ�\n"
-"���Ӥޤ��礦��\n"
-"\n"
-"\n"
-"��⡼�Ȥ� Unix �ޥ���ˤĤʤ��ä��ץ�󥿤򥢥��������������ˤϡ�\n"
-"�֥�⡼�ȥץ�󥿡פ����Ӥޤ���\n"
-"\n"
-"\n"
-"��⡼�Ȥ� MS Windows �ޥ���ˤĤʤ��ä��ץ�󥿤򥢥���������ʤ�\n"
-"(���뤤�� SMB �ץ��ȥ����Ȥä� Unix �ޥ���Υץ�󥿡ˡ����֤Τ�\n"
-"��SMB/Windows 95/98/NT�פǤ���"
+"�̤Υ��ڥ졼�ƥ��󥰥����ƥब�����ƥ��ˤ���С���ưŪ�˵�ư\n"
+"��˥塼���ɲä���ޤ�����¸�Υ��ץ����κ٤��������Ǥ��ޤ���\n"
+"��¸����ȥ����֥륯��å�����ȡ��ѥ�᡼�����Ѥ���������\n"
+"����Ǥ��ޤ����ִ�λ�פ򲡤��С����󥹥ȡ���μ��Υ��ƥåפؿʤ�\n"
+"�ޤ���"
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:647
 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"
-"     ���ڤ�Ф����ΤǤ����Ǥ����顢��äȰ�̣�Τ���̾���ˤ�������С�\n"
-"     �����ޤ����äƤ��ޤ��礦����My printer|lp�פȤ�����硣\n"
-"     ̾���ˡ�lp�פΤĤ����ץ�󥿤��ǥե���ȤΥץ�󥿤ˤʤ�ޤ���\n"
-"\n"
-"\n"
-"   * ����: ����Ϥʤ��Ƥ⤤���Ǥ�����ʣ���Υץ�󥿤���äƤ����ꡢ�ۤ���\n"
-"     �ޥ��󤬤��Υץ�󥿤˥�����������Ȥ��������Ǥ���\n"
-"\n"
-"\n"
-"   * ���: �⤷�ץ�󥿤ξ��ˤĤ��ƾ�������줿����С�������\n"
-"     ���Ϥ��ޤ��礦�ʡ��󳬡פȤ������ʵ��ҤǤ��ޤ��ޤ���ˡ�\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"
-"\n"
-"\n"
-"   * ���塼��̾��: �ץ�󥿤Υ��ס���ϡ��ǥե���ȤǤϡ�lp�פ�Ȥ��ޤ���\n"
-"     �������lp�פȤ����ץ�󥿤�ɬ�פǤ���\n"
-"     �⤷�ץ�󥿤���������Ǥ⡢̾����ʣ�����������ޤ��������������\n"
-"     �ѥ���ʸ���֡áפǶ��ڤ�Ф����ΤǤ����Ǥ����顢��äȰ�̣�Τ���\n"
-"     ̾���ˤ�������С������ޤ����äƤ��ޤ��礦����My printer|lp�פ�\n"
-"     ������硣\n"
-"     ̾���ˡ�lp�פΤĤ����ץ�󥿤��ǥե���ȤΥץ�󥿤ˤʤ�ޤ���\n"
-"\n"
-"\n"
-"   * ���ס���ǥ��쥯�ȥ�: ���Υǥ��쥯�ȥ�˰�������֤���¸����ޤ���\n"
-"     ����Ȥ��٤����狼��ʤ���Хǥե���ȤΤޤޤˤ��Ƥ����ޤ��礦\n"
-"\n"
-"\n"
-"   * �ץ����³: �ץ�󥿤��ޥ����ľ�ܤĤʤ��äƤ�����ϡ�\n"
-"     �֥�������ץ�󥿡פ����Ӥޤ�����⡼�Ȥ�Unix�ޥ����Υץ�󥿤�\n"
-"     �Ȥ��ˤϡ��֥�⡼��lpd�ץ�󥿡פ����Ӥޤ���\n"
-"\n"
-"\n"
-"     ��⡼�ȤΥ�����ɥ����ޥ���ʤޤ���SMB �ץ��ȥ�����Ѥ�Unix�ޥ���\n"
-"     ��Υץ�󥿤򥢥���������ˤϡ���SMB/Windows 95/98/NT�פ����Ӥޤ���\n"
-"\n"
-"\n"
-"     NetWare �ͥåȥ����Υץ�󥿤򥢥�������������С�\n"
-"     ��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"
+"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"
-"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."
+"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 ""
-"�ץ�󥿤����ФǤ��ޤ��󡣥ץ�󥿤���³���줿�ǥХ���̾�����Ϥ���\n"
-"����������\n"
-"\n"
+"LILO (LInux LOader) �� Grub �ϥ֡��ȥ������Ǥ�������ԥ塼�����GNU/Linux\n"
+"�ʤɳƼ�OS��ư�Ǥ��ޤ���\n"
+"���̤ϡ�������OS�ϼ�ưŪ�ˤ�����ȸ��Ф���ƥ��󥹥ȡ��뤵��ޤ���\n"
+"���줬����ʤ顢�����Ǽ�ư�ǥ���ȥ���ɲä��ޤ��礦���ѥ�᡼����\n"
+"�ޤ������ʤ��褦���դ��Ƥ���������\n"
 "\n"
-"���ʤߤˡ��ץ�󥿤ϤդĤ��Ϻǽ�Υѥ���ݡ��ȤˤĤʤ��äƤ����ΤǤ���\n"
-"�����GNU/Linux �Ǥϡ�/dev/lp0�פ�����������ɥ����Ǥϡ�LPT1�פˤʤ�ޤ���"
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "������ΰ������鼫ʬ�Υץ�󥿤�����Ǥ���������"
+"¾��OS�ˤ�¾�οͤ����������Ǥ��ʤ��褦�ˤ��������Ȥ⤢��ޤ�������\n"
+"���ˤϤ���OS�Υ���ȥ�������Ƥ����ޤ��礦�����������ξ��ϡ�\n"
+"����OS��Ȥ��Ȥ��ˤϵ�ư�ǥ��������פ�ޤ��衪"
 
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:658
 msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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."
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
 msgstr ""
-"��ʬ�Υץ�󥿤ˤ��ä������������ץ���������Ǥ���������\n"
-"�ʤˤ����֤��狼��ʤ���С��ץ�󥿤λ����򸫤Ƥ���������\n"
-"\n"
+"GNU/Linux�򤿤�������Τ�ɬ�פʾ���򡢤ɤ����֤����������ꤷ�ޤ���\n"
 "\n"
-"���Υ��ƥåפ������ƥ��ȤǤ��ޤ��������줬�פ��̤�˵�ǽ���ʤ����\n"
-"�������Ѥ����ޤ���"
+"�褯�狼��ʤ��ʤ�֥ɥ饤�֤κǽ�Υ�����(MBR)�פ�����Ǥ���������"
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:665
 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"
+"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 ""
+"�����Ǥϥ���ԥ塼���Ѥΰ��������ƥ�����Ӥޤ���¾��OS�Ǥϰ�Ĥ���\n"
+"�󶡤���ʤ����������ƥब�������Ǥ�3�Ĥ⤢��ޤ���\n"
+"\n"
+" * \"pdq\" - ����ϡ�print, don't queue�ʰ������ƥ��塼�Ϥ��ʤ��ˡ�\n"
+"�Ǥ����ץ�󥿤��ޥ����ľ�뤷�Ƥ��ơ���ͤޤ�ΤȤ��ˤ������ǤǤ�\n"
+"�ơ��ͥåȥ���ץ�󥿤��ʤ����ˤϤ�������Ӥޤ��礦���ͥåȥ��\n"
+"�Ϥ�����ñ�ʤ�Τ����б��Ǥ��ʤ���������˥ͥåȥ���ǻȤ����٤��ʤ�\n"
+"�ޤ���GNU/Linux�����Ƥʤ顢\"pdq\" �����Ӥޤ��礦�����󥹥ȡ�����\n"
+"��PrinterDrake��Mandrake ����ȥ����륻�󥿡���������ǡ֥������ѡ��ȡ�\n"
+"�ܥ���򲡤��С��夫��������Ѥ����ޤ���\n"
+"\n"
+" * \"CUPS\" - ��Common Unix Printing System�ʶ���Unix���������ƥ�ˡ�\n"
+"�ϥ�������ץ�󥿤ؤΰ����⡢�ϵ��΢¦�Υץ�󥿤ؤΰ����⸫���˽���\n"
+"���ޤ��������о��ˤ�Ȥ��뤷���Τʤ���� \"lpd\" ���������ƥ�Υ��饤\n"
+"����Ȥˤ�ʤ�Τǡ��Ť������ƥ�ȸߴ����⤢��ޤ������������ݤ�Ǥ���\n"
+"����������Ū������� \"pdq\" ��Ʊ�����餤��ñ�Ǥ�������� \"lpd\" ������\n"
+"�򥨥ߥ�졼�Ȥ��Ƥۤ�����С�\"cups-lpd\" �ǡ�����ͭ���ˤ��ޤ��礦��\n"
+"������ץ�󥿥��ץ���������Ѥ˥���ե��å��ե���ȥ���ɤ⤢��ޤ���\n"
+"\n"
+" * \"lprNG\" - ��line printer daemon New Generation�ʥ饤��ץ�󥿥ǡ����\n"
+"�˥塼�����ͥ졼�����ˡס������¾�Υ��ץ����Ȥۤ�Ʊ�����Ȥ��Ǥ��ޤ���\n"
+"IPX�ץ��ȥ���򥵥ݡ��Ȥ��Ƥ���Τ�Novell Network��Υץ�󥿤Ǥ�����Ǥ�\n"
+"�뤷�������륳�ޥ�ɤ�ľ�ܰ�����Ǥ��ޤ���Novell ��ɬ�פ��ä��ꡢ�ѥ���\n"
+"��Ȥ鷺�˥��ޥ�ɤذ������������ lprNG��Ȥ��ޤ��礦��\n"
+"����ʤ���С�CUPS �Τۤ�����ñ�����ͥåȥ����Ǥ���ǽ��ͥ��Ƥ���Τ�\n"
+"CUPS�ˤ��ޤ��礦��"
+
+#: ../../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"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"�Ǥ�Linux-Mandrake�����ƥ��root�ѥ���ɤ����ꤷ�ޤ��礦��\n"
-"�ѥ���ɤ� 2 �����Ϥ��ơ������ץߥ����ʤ����ɤ������ǧ���ޤ���\n"
-"\n"
-"\n"
-"Root�Ȥ����Τϥ����ƥ�δ����Ԥǡ������ƥ��������Ѥ�����ͣ���\n"
-"��ʪ�Ǥ����Ǥ����顢���Υѥ���ɤ����Ϥ���Ȥ������դ��Ƥ���������\n"
-"root���¤������˻Ȥ��ȡ����Υ����ƥ�䡢�ͥåȥ���ǤĤʤ��ä�¾��\n"
-"�����ƥ�䤽�Υǡ����˽���ʴ�����ڤܤ����Ȥˤʤ꤫�ͤޤ���\n"
-"\n"
-"\n"
-"�ѥ���ɤϡ�����ե��٥åȤ�����򺮤�����Τˤ��ơ�����Ǥ� 8 ʸ��\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\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�ϥޥ�����IDE�ǥХ������������Ĥ��褦�Ȥ��ޤ����ޤ�PCI SCSI\n"
+"�����ץ��⤢��и��Ф��褦�Ȥ��ޤ���SCSI�����ɤߤĤ����顢Ŭ�ڤʥɥ饤��\n"
+"��ưŪ�˥��󥹥ȡ��뤷�ޤ���\n"
+"\n"
+"�ϡ��ɥ��������ФϤȤ��ɤ����Ԥ��뤳�Ȥ⤢��Τǡ�DrakX��PCI SCSI����\n"
+"�ץ��������ƥ�ˤ��뤫�ɤ�����ǧ����褦ʹ���Ƥ��ޤ����⤷¸�ߤ���ʤ�\n"
+"�֤Ϥ��פ򥯥�å�����ȡ������ץ��Υɥ饤�а�����ɽ������Τǡ���\n"
+"���������Ӥޤ��礦��SCSI ���ʤ���С֤������פ򥯥�å����ޤ���\n"
+"�狼��ʤ���С��֥ϡ��ɥ���������򸫤�פ������OK�򥯥�å�����\n"
+"�ϡ��ɥ����������򸫤뤳�Ȥ�Ǥ��ޤ���\n"
+"\n"
+"��ư�ǥ����ץ�����ꤷ�����ˤϡ�DrakX�ϥ��ץ�������򤷤������ɤ���\n"
+"���䤷�Ƥ��ޤ���DrakX�˥ϡ��ɥ�������ץ����֤����ơ����ץ������ᤵ��\n"
+"�ޤ��礦�������Ƥ�����Ǥ��ޤ�Ư���ޤ���\n"
 "\n"
-"�Ǥ�Ĺ���������䤳���������ꤹ��ѥ���ɤ����Ǥ��衣��ʬ�Ǥ�\n"
-"�ڤ˻פ�������ɬ�פ�����ޤ���"
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"�⥻�����ƥ������ƥ�ˤ�������С��֥���ɥ��ե������Ȥ��פ�\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"
-"�狼��ʤ���Хͥåȥ�������Ԥˤ����Ƥ���������"
+"�⤷ɬ�ץ��ץ�����DrakX����ưŪ�˼����Ǥ��ʤ���Х���ʤ顢�ɥ饤�Ф�\n"
+"��ʬ�ǥ��ץ�����Ϳ����ɬ�פ�����ޤ���\n"
+"�桼�������ɡ�3�ϡ��֥ϡ��ɥ������ˤĤ��Ƥξ�������סˤ��顢����˴ؤ��\n"
+"�����ϡ��ɤΥޥ˥奢���᡼���� Web �����ȡʥͥåȤ˥��������Ǥ���С�\n"
+"���뤤�ϡʥ����ƥ��ˤ���С�MS Windows ����ɤ���ä�ɬ�׾�������뤫\n"
+"��Ĵ�٤Ƥ���������"
 
-#: ../../help.pm_.c:617
+#: ../../help.pm_.c:720
 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"
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\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"
+"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"
-"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"
-"���Ƥ����ޤ���\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"
-"�ޤ��ϼ�ʬ�ѤΥ�������Ȥ�Ĥ��äƤ������������桼�������ʤ���ͤǤ⡢\n"
-"�դ��󥷥��ƥ��Ȥ��Ȥ��ˤϡ�root��ȤäƤ�*�����ޤ���*\n"
-"�������ȡ��������ƥ���Υꥹ�����������礭���ʤ�ޤ�������ä�\n"
-"���������ץߥ��ǡ������ƥ������������ФƤ��ޤ��衣\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"
-"�������äơ��դĤ��Ϥ����ǤĤ���桼����������Ȥǥ����ƥ��Ȥ��ޤ���\n"
-"����root�ǥ������󤹤�Τϡ������ƥ�����ȥ��ƥʥ󥹤ΤȤ������Ǥ���"
-
-#: ../../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 ""
-"��ư�ǥ�����������Ȥ�Ĥ��äƤ����Ƥ����������ޥ����ư�Ǥ��ʤ�\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"
+"         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"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"GNU/Linux�򤿤�������Τ�ɬ�פʾ���򡢤ɤ��˵������������ꤷ�ޤ���\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"
-"���򤹤�Τ������Τ�ʬ����ʤ���С��֥ɥ饤�֤κǽ�Υ�����(MBR)��\n"
-"������Ǥ���������"
-
-#: ../../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 ""
-"�դĤ��ϡ�/dev/hda�סʥץ饤�ޥ����ͥ�Υޥ������ɥ饤�֡ˤ���\n"
-"��/dev/sda�� (�ǽ�� SCSI �ǥ�����) �����Ӥޤ���\n"
-"������������ˤ���¾���ͤ�����Ƥ���������"
-
-#: ../../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"
+" * 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"
-"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: 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 ""
-"LILO (LInux LOader) �� Grub �ϥ֡��ȥ������Ǥ�������ԥ塼�����GNU/Linux\n"
-"�ʤɳƼ�OS��ư�Ǥ��ޤ���\n"
-"���̤ϡ�������OS�ϼ�ưŪ�ˤ�����ȸ��Ф���ƥ��󥹥ȡ��뤵��ޤ���\n"
-"���줬����ʤ顢�����Ǽ�ư�ǥ���ȥ���ɲä��ޤ��礦���ѥ�᡼����\n"
-"�ޤ������ʤ��褦���դ��Ƥ���������\n"
-"\n"
-"\n"
-"¾��OS�ˤ�¾�οͤ����������Ǥ��ʤ��褦�ˤ��������Ȥ⤢��ޤ�������\n"
-"���ˤϤ���OS�Υ���ȥ�������Ƥ����ޤ��礦�����������ξ��ϡ�\n"
-"����OS��Ȥ��Ȥ��ˤϵ�ư�ǥ��������פ�ޤ��衪"
-
-#: ../../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"
-"\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"
+"yaboot�Ѥ��ɲå���ȥ�򤳤����ɲäǤ��ޤ���¾��OS�ξ��Ǥ⡢¾��\n"
+"�����ͥ�Ǥ⡢�۵��ѵ�ư���᡼���Ǥ��ǽ�Ǥ���\n"
 "\n"
+"�ۤ���OS�ξ�� - ����ȥ�ϡ���٥��root�ѡ��ƥ����������Ǥ���\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"
+"Linux �ξ�硢��ǽ�ʥ��ץ���󤬤����Ĥ�����ޤ�: \n"
 "\n"
+"  * ��٥�: ���ε�ư���ץ��������֤Ȥ��ˡ�yaboot�ץ���ץȤǥ�����\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 �� grub �μ��ץ��ץ����ϰʲ��ΤȤ���Ǥ�:\n"
-"  - �֡��ȥǥХ���: �֡��ȥ���������ĥǥХ���̾������ʤ��Ȥ��Хϡ���\n"
-"�ǥ������Υѡ��ƥ������ˡ��������ʤ��¤ꡢ��/dev/hda�פ����Ӥޤ��礦��\n"
+"  * ���᡼��: ��ư���륫���ͥ��̾�Ρ����̤� vmlinux���ޤ���\n"
+"����ˤʤˤ���ĥ�Ҥ��Ĥ�����Τˤʤ�ޤ���\n"
 "\n"
+"  * ��ư: Linux���󥹥ȡ����Ѥ�root�ѡ��ƥ������ޤ��ϡ�/��\n"
 "\n"
-"  - �ǥե���ȥ��᡼����ư���Ԥ�����: �֡��ȥ��������ǽ�Υ��᡼����ư\n"
-"����ޤǤ��Ԥ����֤�1/10��ñ�̤ǻ��ꤷ�ޤ�������ϡ������ܡ��ɤ�ͭ����\n"
-"�ʤäƤ����˥ϡ��ɥǥ��������鵯ư���륷���ƥ�ʤɤ������Ǥ�������\n"
-"���Ԥ����֡פ�̵�������ä��ꥼ�����ä��ꤷ���顢�֡��ȥ��������Ԥ��ޤ���\n"
+"  \n"
+"  * �ɲ�: Apple �Υϡ��ɥ������Ǥϡ������ͥ��ɲå��ץ����Ϥ��ʤ�ξ��\n"
+"�ӥǥ��ϡ��ɥ������ν�����˻Ȥä��ꡢ1�ܥ���ޥ����Ѥ˥����ܡ��ɤˤ��\n"
+"�ޥ����ܥ���Υ��ߥ�졼�����˻Ȥä��ꤷ�ޤ����ʲ������󤲤ޤ�:\n"
 "\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
-"  - �ӥǥ��⡼�ɡ���ư���˻Ȥ� VGA �ƥ����ȥ⡼�ɤ���ꤷ�ޤ����Ȥ���Τ�\n"
-"�ʲ����ͤǤ���\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"    * �Ρ��ޥ�: �̾�� 80x25 �Υƥ����ȥ⡼��\n"
+"  * Initrd: ���Υ��ץ����ϡ���ư�ǥХ�����ͭ���ˤʤ����˽���⥸�塼��\n"
+"�Υ����ɤ������뤤�϶۵޵�ư����ramdisk ���᡼���Υ����ɤ˻Ȥ��ޤ���\n"
 "\n"
-"    * <����>:  �������б������ƥ����ȥ⡼��\n"
+"  * Initrd-size: �ǥե���Ȥ� ramdisk ��������4096 �Х��ȤǤ���\n"
+"��ä��礭�� ramdisk ��Ȥ��Ȥ��ˡ����Υ��ץ�������Ѥ��ޤ���\n"
 "\n"
-"  - ��ư�Τ��Ӥ� \"/tmp\" �򥯥ꥢ: �����ƥ൯ư���� \"/tmp\" ������ե�����"
-"��ǥ��쥯�ȥ��\n"
-"�õ������Ф��Υ��ץ��������Ӥޤ���\n"
+"  * Read-write: �̾��root�ץѡ��ƥ��������ɤ߽Ф����Ѥǵ�ư����\n"
+"�����ƥब��Ω���夬������˥ե����륷���ƥ�Υ����å��򤷤ޤ�������\n"
+"���ץ����Ǥ���򥪡��С��饤�ɤǤ��ޤ���\n"
 "\n"
+"  * NoVideo: Apple �Υӥǥ���ϩ����ü������򵯤����褦�ʤ顢����\n"
+"���ץ���������ǡ֥ӥǥ��ʤ��ץ⡼�ɤǵ�ư�Ǥ��ޤ������ξ��ˤ�\n"
+"�ͥ��ƥ��֤Υե졼��Хåե��ǵ�ư���ޤ���\n"
 "\n"
-"  - ɬ�פ˱����Ƹ�̩�� RAM ����: ��ǰ�ʤ��顢BIOS �˥ޥ����� RAM ��\n"
-"���Τ��̤򤭤���ˡ�����줵��Ƥ��ޤ��󡣤��Τ��� Linux �ϡ�RAM��\n"
-"�̤����Τ˸��ФǤ��ʤ����⤷��ޤ��󡣤��ξ�硢���������Τ� RAM ��\n"
-"�̤򤳤��ǻ���Ǥ��ޤ����ʤ������Ф��줿RAM�ȼºݤ�RAM�� 2-4 MB �ۤ�\n"
-"����Ƥ���ΤϤޤä�������ʤ������ʤ��ȤǤ���"
+"  * �ǥե����: �ǥե���Ȥ� Linux ������Ȥ��Ƥ��Υ���ȥ꤬�Ȥ��\n"
+"�ޤ��������ñ�ˡ�yaboot �ץ���ץȤ� ENTER �򲡤������٤ޤ�������\n"
+"����ȥ�Ϥޤ���TAB�򲡤��Ƶ�ư����������ɽ���������Ȥ��ˤϡ�\n"
+"��*�פ��Ĥ��ƥϥ��饤�Ȥ���Ƥ��ޤ���"
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:765
 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"
+"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"
-"Yaboot 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 ""
 "Yaboot �ϡ�NewWorld MacIntosh �ϡ��ɥ������ѤΥ֡��ȥ������Ǥ������줬\n"
 "����ȡ��ޥ�����GNU/Linux, MacOS, MacOSX ��ư�������٤ޤ���\n"
@@ -3452,359 +3564,125 @@ msgstr ""
 "���󥹥ȡ��뤵��ޤ����⤷����ʤ顢���β��̤ǡ���ʬ�ǥ���ȥ���ɲ�\n"
 "�Ǥ��ޤ����������ѥ�᡼�������֤褦���դ��Ƥ���������\n"
 "\n"
-"\n"
 "Yaboot �μ祪�ץ�����:\n"
 "\n"
+"  * ��ư��å�����: boot�ץ���ץ�����ɽ��������ñ�ʥ�å�����\n"
 "\n"
-"  - ��ư��å�����: boot�ץ���ץ�����ɽ��������ñ�ʥ�å�����\n"
-"\n"
-"\n"
-"  - ��ư�ǥХ���: GNU/Linux ��ư�Ѥξ����ɤ����֤����ؼ���\n"
+"  * ��ư�ǥХ���: GNU/Linux ��ư�Ѥξ����ɤ����֤����ؼ���\n"
 "���̤ϡ����ξ����Ѥ˥֡��ȥ��ȥ�å��ѤΥѡ��ƥ�������\n"
-"���������ʳ��Ǻ�ä���Ϥ��Ǥ���\n"
-"\n"
+"���������ʳ��Ǻ�äƤ���Ϥ��Ǥ���\n"
 "\n"
-"  - �����ץ�ե����०�������Ԥ�����: LILO �Ȥ����äơ�yaboot�ˤ��Ԥ�����\n"
+"  * �����ץ�ե����०�������Ԥ�����: LILO �Ȥ����äơ�yaboot�ˤ��Ԥ�����\n"
 "�����������Ǥ��ޤ����ǽ���Ԥ����֤���ñ�̤ǡ������Ԥ����֤δ֤ˡ�\n"
 "CD, OF boot, MacOS, Linux�Τɤ��ư���뤫���٤ޤ���\n"
 "\n"
-"\n"
-"  - �����ͥ뵯ư�����ॢ����: ���Υ����ॢ���Ȥ� LILO ��ư�Ԥ����֤Ȼ��Ƥ���"
+"  * �����ͥ뵯ư�����ॢ����: ���Υ����ॢ���Ȥ� LILO ��ư�Ԥ����֤Ȼ��Ƥ���"
 "����Linux ��������顢�����Ԥ����֤�0.1��ñ�̤Ǽ¹Ԥ���ơ����Τޤ�\n"
 "���ȥǥե���ȤΥ����ͥ뵭�Ҥ����Ф�ޤ���\n"
 "\n"
-"\n"
 "  - CD ��ư��ͭ���ˤ��ޤ���?: ���Υ��ץ���������å�����ȡ��ǽ�ε�ư�ץ�"
 "��ץȤǡ�C�פ������CD���鵯ư�Ǥ���褦�ˤʤ�ޤ���\n"
 "\n"
-"\n"
-"  - OF ��ư��ͭ���ˤ��ޤ���?: ���Υ��ץ���������å�����ȡ��ǽ�ε�ư�ץ�"
+"  * OF ��ư��ͭ���ˤ��ޤ���?: ���Υ��ץ���������å�����ȡ��ǽ�ε�ư�ץ�"
 "��ץȤǡ�N�פ�����ǥ����ץ�ե����०�������鵯ư�Ǥ��ޤ���\n"
 "\n"
-"\n"
-"  - �ǥե���� OS: �����ץ�ե����०�������Ԥ����֤��᤮���Ȥ����ɤ�\n"
+"  * �ǥե���� OS: �����ץ�ե����०�������Ԥ����֤��᤮���Ȥ����ɤ�\n"
 "OS����ư���뤫����ꤷ�ޤ���"
 
-#: ../../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"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \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"
-" \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"
+" * \"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: 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"
+" * \"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: 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."
+" * \"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 ""
-"yaboot�Ѥ��ɲå���ȥ�򤳤����ɲäǤ��ޤ���¾��OS�ξ��Ǥ⡢¾��\n"
-"�����ͥ�Ǥ⡢�۵��ѵ�ư���᡼���Ǥ��ǽ�Ǥ���\n"
-"\n"
-"\n"
-"�ۤ���OS�ξ�� - ����ȥ�ϡ���٥��root�ѡ��ƥ����������Ǥ���\n"
-"\n"
-"\n"
-"Linux �ξ�硢��ǽ�ʥ��ץ���󤬤����Ĥ�����ޤ�: \n"
+"���ʤ��Υޥ���˴ؤ���Ƽ�Υѥ�᡼���򼨤��ޤ����ϡ��ɥ������ˤ�\n"
+"���ޤ������ʲ��Τ褦�ʹ��ܤ��ФƤ���Ϥ��Ǥ�:\n"
 "\n"
+" * �ޥ���: �ޥ��������ߤΥޥ�������򸫤ơ�ɬ�פʤ�ܥ���򥯥�å������ѹ���"
+"�ޤ���\n"
 "\n"
-"  - ��٥�: ���ε�ư���ץ��������֤Ȥ��ˡ�yaboot�ץ���ץȤǥ�����\n"
-"����̾�Ρ�\n"
-"\n"
-"\n"
-"  - ���᡼��: ��ư���륫���ͥ��̾�Ρ����̤� vmlinux���ޤ���\n"
-"����ˤʤˤ���ĥ�Ҥ��Ĥ�����Τˤʤ�ޤ���\n"
+" * �����ܡ��ɡ������ܡ��ɡ����ޤΥ����ܡ��ɤγ�������򸫤ơ�ɬ�פʤ�\n"
+"�ܥ���򥯥�å������ѹ����ޤ���\n"
 "\n"
+" * ������: �����ӡ�DrakX �ϥǥե���Ȥǡ����ʤ������������˱�����\n"
+"�����Ӥ���ꤷ�ޤ����Ǥ⤳���Ǥ⥭���ܡ��ɤ������Ʊ���ǡ�����Ȥ�\n"
+"��������ˤ���Ȥ��ˤϡ������ӥܥ���򲡤��ơ���ʬ�λ����Ӥˤ��碌��\n"
+"����ˤǤ��ޤ���\n"
 "\n"
-"  - ��ư: Linux���󥹥ȡ����Ѥ�root�ѡ��ƥ������ޤ��ϡ�/��\n"
+" * �ץ��: �֥ץ�󥿤ʤ��ץܥ���򲡤��ȡ��ץ�����ꥦ��������\n"
+"�������ޤ���\n"
 "\n"
+" * ������ɥ�����: ������ɥ����ɤ����Ф��줿�餳����ɽ������ޤ���\n"
+"���󥹥ȡ�����ˤ��ѹ��Ǥ��ޤ���\n"
 "\n"
-"  \n"
-"  - �ɲ�: Apple �Υϡ��ɥ������Ǥϡ������ͥ��ɲå��ץ����Ϥ��ʤ�ξ��\n"
-"�ӥǥ��ϡ��ɥ������ν�����˻Ȥä��ꡢ1�ܥ���ޥ����Ѥ˥����ܡ��ɤˤ��\n"
-"�ޥ����ܥ���Υ��ߥ�졼�����˻Ȥä��ꤷ�ޤ����ʲ������󤲤ޤ�:\n"
+" * TV ������: TV �����ɤ����Ф��줿�餳����ɽ������ޤ���\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: ���Υ��ץ����ϡ���ư�ǥХ�����ͭ���ˤʤ����˽���⥸�塼��\n"
-"�Υ����ɤ������뤤�϶۵޵�ư����ramdisk ���᡼���Υ����ɤ˻Ȥ��ޤ���\n"
-"\n"
-"\n"
-"  - Initrd-size: �ǥե���Ȥ� ramdisk ��������4096 �Х��ȤǤ���\n"
-"��ä��礭�� ramdisk ��Ȥ��Ȥ��ˡ����Υ��ץ�������Ѥ��ޤ���\n"
-"\n"
-"\n"
-"  - Read-write: �̾��root�ץѡ��ƥ��������ɤ߽Ф����Ѥǵ�ư����\n"
-"�����ƥब��Ω���夬������˥ե����륷���ƥ�Υ����å��򤷤ޤ�������\n"
-"���ץ����Ǥ���򥪡��С��饤�ɤǤ��ޤ���\n"
-"\n"
-"\n"
-"  - NoVideo: Apple �Υӥǥ���ϩ���۾������򵯤����褦�ʤ顢����\n"
-"���ץ���������ǡ֥ӥǥ��ʤ��ץ⡼�ɤǵ�ư�Ǥ��ޤ������ξ��ˤ�\n"
-"�ͥ��ƥ��֤Υե졼��Хåե��ǵ�ư���ޤ���\n"
-"\n"
-"\n"
-"  - �ǥե����: �ǥե���Ȥ� Linux ������Ȥ��Ƥ��Υ���ȥ꤬�Ȥ��\n"
-"�ޤ��������ñ�ˡ�yaboot �ץ���ץȤ� ENTER �򲡤������٤ޤ�������\n"
-"����ȥ�Ϥޤ���TAB�򲡤��Ƶ�ư����������ɽ���������Ȥ��ˤϡ�\n"
-"��*�פ��Ĥ��ƥϥ��饤�Ȥ���Ƥ��ޤ���"
+" * ISDN ������: ISDN ���Ф��줿�餳����ɽ������ޤ���\n"
+"�ܥ���򥯥�å�����ȴ�Ϣ�ѥ�᡼�����Ѥ����ޤ���"
 
-#: ../../help.pm_.c:793
+#: ../../help.pm_.c:827
 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!"
+"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 ""
-"SILO ��SPARC�ѤΥ֡��ȥ������Ǥ�������ԥ塼�����GNU/Linux\n"
-"�ʤɳƼ�OS��ư�Ǥ��ޤ���\n"
-"���̤ϡ�������OS�ϼ�ưŪ�ˤ�����ȸ��Ф���ƥ��󥹥ȡ��뤵��ޤ���\n"
-"���줬����ʤ顢�����Ǽ�ư�ǥ���ȥ���ɲä��ޤ��礦���ѥ�᡼����\n"
-"�ޤ������ʤ��褦���դ��Ƥ���������\n"
-"\n"
-"\n"
-"¾��OS�ˤ�¾�οͤ����������Ǥ��ʤ��褦�ˤ��������Ȥ⤢��ޤ�������\n"
-"���ˤϤ���OS�Υ���ȥ�������Ƥ����ޤ��礦�����������ξ��ϡ�\n"
-"����OS��Ȥ��Ȥ��ˤϵ�ư�ǥ��������פ�ޤ��衪"
-
-#: ../../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 ""
-"SILO �μ��ץ��ץ����ϰʲ��ΤȤ���Ǥ�:\n"
-"  - �֡��ȥ�������Ƴ��: GNU/Linux ��ư����Τ�ɬ�פȤʤ������֤�����\n"
-"����Ƥ����������ʤˤ򤹤�Ф������Ϥä����ʬ����ʤ����ϡ�\n"
-"�֥ɥ饤�֤κǽ�Υ�����(MBR)�פ����Ӥޤ��礦��\n"
-"\n"
-"\n"
-"  - �ǥե���ȥ��᡼����ư���Ԥ�����: �֡��ȥ��������ǽ�Υ��᡼����ư\n"
-"����ޤǤ��Ԥ����֤�1/10��ñ�̤ǻ��ꤷ�ޤ�������ϡ������ܡ��ɤ�ͭ����\n"
-"�ʤäƤ����˥ϡ��ɥǥ��������鵯ư���륷���ƥ�ʤɤ������Ǥ�������\n"
-"���Ԥ����֡פ�̵�������ä��ꥼ�����ä��ꤷ���顢�֡��ȥ��������Ԥ��ޤ���"
+"������ Mandrake Linux �ѡ��ƥ������Υ��󥹥ȡ����Ѥ˾õ����\n"
+"�ϡ��ɥǥ�����������Ǥ������������Υϡ��ɥǥ�������Υǡ���������\n"
+"�ä��Ʋ����Ǥ��ޤ������դ��Ƥ���������"
 
-#: ../../help.pm_.c:818
+#: ../../help.pm_.c:832
 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"
+"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"
-"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 ""
-"�Ǥ�X������ɥ������ƥ������򤷤ޤ��礦�������GNU/Linux GUI (����ե���"
-"��\n"
-"�桼�����󥿡��ե������ˤγ˿���ʬ�Ǥ������Τ���ˤϤޤ����ӥǥ������ɤ�\n"
-"��˥�������򤷤ޤ����������桢�ۤȤ�ɤϼ�ư������Ƥ���Τǡ��̾�ʤ�\n"
-"ñ�ˡ���̤򸫤Ƥ��������ǧ��������Ǥ��ߤޤ���\n"
-"\n"
+"���Υϡ��ɥǥ�������Τ��٤ƤΥǡ�����ѡ��ƥ�������\n"
+"�õ��ʤ��OK�פ򥯥�å����Ƥ�����������OK�פ򥯥�å������顢\n"
+"���Υϡ��ɥǥ�������˺�����ǡ�����ѡ��ƥ������ϡ�������ɥ���\n"
+"�Τ�Τ�ޤᡢ���٤ƾõ��Ʋ����Բ�ǽ�ˤʤ�ޤ���\n"
 "\n"
-"���꤬����ä��顢X������������ޤ��ʤ��ʤ�����������ʤ�DrakX��̿�ᤷ�ʤ�\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 �����꤬����������С����Υ��ץ�����Ȥäơ�X������ɥ������ƥ��\n"
-"���������ꤷľ���Ƥ���������"
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"����ե����롦�������󤬹����ʤ顢�֤Ϥ��פ����Ӥޤ��������Ǥʤ����\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"
-msgstr ""
-"�ޥ���Υ������ƥ��Υ�٥�����٤ޤ����ܤ��������ϥޥ˥奢��򻲾ȡ�\n"
-"����Ū�ˤϡ��ɤ�����٤Ф������狼��ʤ���Хǥե���ȤΤޤޤˤ��ޤ���\n"
+"������������ơ��ϡ��ɥǥ�������Υǡ�����ѡ��ƥ�������\n"
+"���Τޤޤˤ��Ƥ����ˤϡ֥���󥻥�פ򥯥�å����ޤ��礦��"
 
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"�����ƥ��Ƶ�ư���ޤ���\n"
-"\n"
-"�Ƶ�ư�����顢������ Linux Mandrake �����ƥब��ưŪ�ˤ���������ޤ���\n"
-"�̤�OS�򤿤����������Ȥ��ˤϡ��ɲä��������ɤ�Ǥ���������"
+"�����ͥ���б����������ͥ�⥸�塼��򥢥������Ǥ��ޤ���ʥե�����%s�������"
+"����)"
 
-#: ../../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
-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 "�롼�ȥѥ����"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "�桼������Ͽ"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "�ͥåȥ������"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-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 ������"
-
-#: ../../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"
@@ -3818,21 +3696,30 @@ 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 "NIS �ɥᥤ�󤬤ʤ��Τǥ֥����ɥ��㥹�Ȥ��Ȥ��ޤ���"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "FAT�����Υե��åԡ���ɥ饤�� %s ������"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 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''"
@@ -3840,30 +3727,20 @@ 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 "OK"
 
-#: ../../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 ""
@@ -3873,7 +3750,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"
@@ -3883,11 +3760,11 @@ msgstr ""
 "�������ѡ��ƥ�������Ĥ��뤫����¸�Τ�Τ򥯥�å��������Ӥޤ���\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 "����åץѡ��ƥ������ɬ�פǤ�"
 
-#: ../../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"
@@ -3897,55 +3774,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 "/boot/efi �� FAT �ѡ��ƥ�������ޥ���Ȥ��Ƥ�������"
+
+#: ../../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 �ѡ��ƥ�������롼�ץХå��˻���"
 
-#: ../../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 "����åץѡ��ƥ������Υ����� (MB): "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "������ɥ����ѡ��ƥ�������Υե꡼���ڡ��������"
 
-#: ../../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 "������ɥ����ե����륷���ƥ�ζ�����׻�"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3954,11 +3835,11 @@ 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 "������ɥ����ѡ��ƥ���������Ҳ��������Ǥ����ȥǥե饰�ɤ��Ƥ���������"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3977,21 +3858,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 "������ɥ����ѤˤɤΤ��餤�Υ�������Ĥ��Ƥ����ޤ���"
 
-#: ../../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)"
@@ -3999,33 +3880,33 @@ msgstr ""
 "�ꥵ������롼�ץХå��Ѥ�FAT�ѡ��ƥ�����󤬤���ޤ��� (�ޤ��Ͻ�ʬ�ʥ��ڡ���"
 "��̵��)"
 
-#: ../../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
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 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"
@@ -4034,28 +3915,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 "������ɥ����ѡ��ƥ�������Υե꡼���ڡ�������ޤ���"
 
-#: ../../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 "�ͥåȥ������ߤ���"
 
@@ -4067,12 +3948,12 @@ msgstr ""
 "���顼ȯ�������ޤ�����������ˡ���狼��ޤ���\n"
 "��ʬ����Ǥ��³���Ʋ�������"
 
-#: ../../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"
@@ -4085,16 +3966,16 @@ msgstr ""
 "���ƤߤƤ���������\n"
 "�� 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"
@@ -4108,32 +3989,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 "���󥹥ȡ�����"
 
@@ -4141,7 +4022,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 "�Ĥ���� "
 
@@ -4150,21 +4031,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 "��˿ʤߤޤ�����"
+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 "�ѥå�����������ǥ��顼��ȯ��:"
 
@@ -4172,30 +4053,34 @@ msgstr "�ѥå�����������ǥ��顼��ȯ��:"
 msgid "Use existing configuration for X11?"
 msgstr "���Ǥˤ��� 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 ""
-"�����ƥ�꥽��������ޤ��� Linux-Mandrake �򥤥󥹥ȡ��뤹��ˤ�\n"
+"�����ƥ�꥽��������ޤ��� Mandrake Linux �򥤥󥹥ȡ��뤹��ˤ�\n"
 "�����Ĥ����꤬����ޤ���\n"
 "���ξɾ����������Ȥ��������˥ƥ����ȥ��󥹥ȡ�����ޤ���\n"
 "����򤹤�ˤϡ�CDROM ����֡��Ȥ����Ȥ�����F1�פ򲡤�����text�פ����Ϥ���\n"
 "����������"
 
-#: ../../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"
@@ -4210,7 +4095,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"
@@ -4226,83 +4111,67 @@ 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?"
@@ -4310,24 +4179,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
+#: ../../install_steps_gtk.pm_.c:522
 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"
@@ -4387,15 +4272,15 @@ msgstr ""
 "��Ԥ�°�������եȥ������ץ�������Ŭ�Ѥ������Ū�⻺�����ˡ��\n"
 "��ä��ݸ��Ƥ��ޤ���\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"
@@ -4408,7 +4293,7 @@ msgstr ""
 "�� %s �פȤ��� Cd-Rom ��ɥ饤�֤ˤ���ơ� Ok �򲡤��Ƥ���������\n"
 "CD���ʤ���С�Cancel �򲡤��Ƥ��� Cd-Rom ����Υ��󥹥ȡ������򤷤Ʋ�������"
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "�ѥå������Υ��󥹥ȡ���ǥ��顼��ȯ��:"
 
@@ -4416,34 +4301,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"
@@ -4497,7 +4369,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"
@@ -4534,7 +4406,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"
@@ -4553,36 +4425,29 @@ msgid ""
 "Paris - France.\n"
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 msgstr ""
-"Introduction\n"
+"�Ϥ����\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake 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"
+"�ܥ��ڥ졼�ƥ��󥰥����ƥप���Mandrake Linux�ǥ����ȥ�ӥ塼������\n"
+"�󶡤����Ƽ�Υ���ݡ��ͥ�Ȥ򡢰ʲ��Ǥϡ֥��եȥ��������ʡפȸƤ֡�\n"
+"���եȥ��������ʤϡ����ڥ졼�ƥ��󥰥����ƥप���Mandrake Linux�ǥ���\n"
+"�ȥ�ӥ塼�������󶡤����Ƽ�Υ���ݡ��ͥ�Ȥ˴�Ϣ����ץ�����ෲ\n"
+"��᥽�åɡ���������ɥ�����ơ�������ޤब������˸¤����Τ�\n"
+"�Ϥʤ���\n"
 "\n"
 "\n"
-"1. License Agreement\n"
+"1. �饤����Ʊ�ջ���\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"
+"����ʸ��򿵽Ť��ɤ�Ǥ�����������ʸ��Ϥ��ʤ���Mandrake S.A.�Ȥδ֤�\n"
+"���뤵��롢���եȥ��������ʤ�Ŭ�Ѥ����饤����Ʊ�ջ���Ǥ���\n"
+"���եȥ��������ʤ򤤤��ʤ���Ǥ��쥤�󥹥ȡ��롢ʣ�������Ѥ��뤳�Ȥ�\n"
+"���ʤ�������Ū�ˡ��ܥ饤���󥹤���������˽������Ȥ��������\n"
+"������Ʊ�դ�����ΤȤ���ޤ���\n"
+"�ܥ饤���󥹤Τ����ʤ���ʬ�Ǥ���Ʊ�դǤ��ʤ���С����եȥ��������ʤ�\n"
+"���󥹥ȡ��롢ʣ�������Ѥ�ǧ����ޤ���\n"
+"�ܥ饤���󥹤ξ������Ŭ�礷�ʤ����ǥ��եȥ��������ʤ򥤥󥹥ȡ���\n"
+"ʣ�������Ѥ��褦�Ȥ����ߤ�̵���Ǥ��ꡢ�ܥ饤���󥹲��ǤΤ��ʤ��θ���\n"
+"����å���뤳�ȤȤʤ�ޤ����饤���󥹤��˴���ȼ�������ʤ��ϥ��եȥ�����\n"
+"���ʤ�ʣ�����٤Ƥ�¨�¤��˲����ʤ���Фʤ�ޤ���\n"
 "\n"
 "\n"
 "2. Limited Warranty\n"
@@ -4615,7 +4480,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"
@@ -4652,7 +4517,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"
@@ -4671,103 +4536,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 "�����ܡ���"
 
-#: ../../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 "�Ȥ��륭���ܡ��ɥ쥤�����Ȥΰ�����ɽ�����ޤ���"
 
-#: ../../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 "�ܥ��󥨥ߥ�졼�����"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "�ܥ���2�Υ��ߥ�졼�����"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 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"
@@ -4785,7 +4646,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!"
@@ -4793,78 +4654,119 @@ 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 �֡��ȥ��ȥ�å��Ѥζ������ڡ���������ޤ��󡪡����󥹥ȡ����³���ޤ�"
+"���������ƥ�ε�ư�ˤ� DiskDrake �ǥ֡��ĥ��ȥ�åץѡ��ƥ��������äƤ���"
+"����."
+
+#: ../../install_steps_interactive.pm_.c:349
+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 "�����ƥ�Υ롼�ȥѡ��ƥ������(/) �Ϥʤ�Ǥ�����"
 
-#: ../../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 "���ɥ֥��å��򸡺����ޤ�����"
 
-#: ../../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 "���󥹥ȡ���˽�ʬ�ʥ���åפ�����ޤ��󡤥���åפ�ä��Ʋ�����"
 
-#: ../../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 ""
 "���󥹥ȡ���䥢�åץ��졼�ɤ�ɬ�פʥǥ������ζ������̤����Ǥ��� (%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"
+"������ auto_install �����������ե��åԡ���Ʊ���Ǥ���"
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../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: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"
@@ -4874,12 +4776,12 @@ msgstr ""
 "CD����Ĥ�ʤ���С�����󥻥�򥯥�å����Ƥ���������\n"
 "�긵�ˤʤ�CD������С���������򤫤�Ϥ����Ƥ���Ok�򥯥�å����ޤ���"
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "�� %s �פȤ���Cd-Rom"
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4888,11 +4790,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"
@@ -4956,93 +4868,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 "�ɤΥ����Ȥ���ѥå���������äƤ��뤫������"
 
-#: ../../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: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: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 "��⡼��CUPS ������"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "�ץ�󥿤ʤ�"
 
-#: ../../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
 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
 msgid "ISDN card"
 msgstr "ISDN������"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 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 "�ɤΰ��������ƥ��Ȥ��ޤ�����"
+#: ../../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 "�롼�ȥѥ����"
 
-#: ../../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:949
+msgid "Authentication LDAP"
+msgstr "ǧ��LDAP"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "���������ڡ���"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr "LDAP�١���dn"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:951
+msgid "LDAP Server"
+msgstr "LDAP������"
+
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
 msgstr "ǧ��NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "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 "
@@ -5069,19 +5021,19 @@ msgstr ""
 "�֡��ȥǥ���������ʤ�С��ե��åԥ��ǥ�������ɥ饤�֤���������\n"
 "��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 "�����ܤΥե��åԡ��ɥ饤��"
 
-#: ../../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 "
@@ -5102,32 +5054,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 �֡��ȥ������Ϥ���ǤϻȤ��ޤ���\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?"
@@ -5135,51 +5099,59 @@ msgstr ""
 "aboot ���󥹥ȡ�����˥��顼ȯ����\n"
 "̵���˥��󥹥ȡ��뤷�Ƥߤޤ��������������ǽ�Υѡ��ƥ�������˲�����ޤ���"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+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
+#, 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 ""
+"�����ץ�ե����०������ư�ǥХ������ѹ����ʤ��ȡ��֡��ȥ�������\n"
+"ͭ���ˤʤ�ʤ����⤷��ޤ��󡣺Ƶ�ư���ƥ֡��ȥ������Υץ���ץ�\n"
+"���Фʤ��ä��顢�Ƶ�ư���� Command-Option-O-F �򲡤��Ƥ������Ϥ��ޤ�:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" ���줫�餳�������פ��ޤ�: shut-down\n"
+"���ε�ư���ˤϥ֡��ȥ������Υץ���ץȤ��Ф�Ϥ��Ǥ���"
 
-#: ../../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 "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"
@@ -5189,32 +5161,32 @@ 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"
 "�֡����ѥ�ǥ�����ȴ���ơ��꥿����򲡤��ƺƵ�ư���Ʋ�������\n"
 "\n"
-"���ΥС������� Linux-Mandrake �ΥХ���������ϡ�\n"
+"���ΥС������� Mandrake Linux �ΥХ���������ϡ�\n"
 "http://www.linux-mandrake/ ��Ĵ�٤��ޤ���\n"
 "\n"
 "���󥹥ȡ���������ˤĤ��Ƥϥ桼�������ɤΡ֥��󥹥ȡ��뤷����פ�\n"
 "�Ϥ򻲾Ȥ��Ʋ�������"
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 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"
@@ -5227,40 +5199,56 @@ msgstr ""
 "(������̤Υޥ���ؤΥ��󥹥ȡ����ѤΤ�ΤǤ�).\n"
 "\n"
 
-#: ../../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
 msgid "Replay"
 msgstr "����"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 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
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "kdesu ������ޤ���"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+msgid "Choose a file"
+msgstr "�ե����������"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 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"
@@ -5286,267 +5274,284 @@ msgstr "�ɤ�ˤ��ޤ������ʥǥե���Ȥ� %s��"
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "�ɤ�ˤ��ޤ������ʥǥե���Ȥ� %s�����Фʤ��ʤ�֤ʤ��ס�"
 
-#: ../../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 "�����ꥹ�������ܡ���"
 
-#: ../../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 "����ꥫ�������ܡ���"
 
-#: ../../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 "������Х������(cyrillic)"
-
-#: ../../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 (US)"
 
-#: ../../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
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 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 "��ȥ��˥� �ֿ������ QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "��ȥ��˥� ��ȯ���� QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+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
-msgid "Russian (Yawerty)"
-msgstr "�������� ������������ ��"
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "�롼�ޥ˥���qwertz��"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "���������ǥ�"
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "�롼�ޥ˥���qwerty��"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "��������Yawerty��"
+
+#: ../../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
+msgid "Serbian (cyrillic)"
+msgstr "����ӥ�(cyrillic)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "�����������ܡ���"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+msgid "Tajik keyboard"
+msgstr "�������������ܡ���"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "�ȥ륳������Ū�֣ơץ�ǥ��"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "�ȥ륳�ʸ���֣ѡץ�ǥ��"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "�����饤��"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "����ꥫ�������ܡ��ɡʹ�ݼ���"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "�٥ȥʥ� �ֿ������ QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
-msgstr "�桼������ӥ��ʥ�ƥ�/������"
+#: ../../keyboard.pm_.c:240
+msgid "Yugoslavian (latin)"
+msgstr "�桼������ӥ��ʥ�ƥ��"
+
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "���ޥ���� %s\n"
 
-#: ../../lvm.pm_.c:70
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "�ޤ������ܥ�塼��������Ƥ���������\n"
 
@@ -5658,170 +5663,221 @@ msgstr "�ʤ�"
 msgid "No mouse"
 msgstr "�ޥ����ʤ�"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../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 "��λ"
 
-#: ../../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 "���󥿡��ͥåȤ�����"
+#: ../../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 "Alcatel speedtouch usb"
 
-#: ../../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��Ȥ�"
+
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "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 ""
-"���Υޥ���ϥ��󥿡��ͥåȤؤĤʤ��äƤ��ʤ��褦�Ǥ��͡�\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������Ǥ���������"
+"�����ƥ��˥������ͥåȥ����ץ������Ĥ���ޤ��󡣤��μ����\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 "������ mem (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"
+"�ۥ���̾�ϡ�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 ��ǥ�"
 
-#: ../../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"
 
-#: ../../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 "��������ȥ�������ʥ桼��̾��"
+#: ../../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
+msgid "Europe protocol"
+msgstr "�衼���åѤΥץ��ȥ���"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
-msgstr "�衼���å� (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol (EDSS1)"
+msgstr "�衼���åѥץ��ȥ��� (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
-msgstr "�����Τ���¾"
+#: ../../network/isdn.pm_.c:184
+msgid "Protocol for the rest of the world"
+msgstr "�����Τ���¾�ѥץ��ȥ���"
 
-#: ../../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 ""
-"�����Τ���¾ \n"
+"�����Τ���¾�ѥץ��ȥ��� \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"
@@ -5833,19 +5889,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."
@@ -5853,106 +5909,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 PCI �����ɤϸ��դ���ޤ���Ǥ��������β��̤�������Ǥ�������"
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"�����ƥ��˥������ͥåȥ����ץ������Ĥ���ޤ��󡣤��μ����\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 "��ǥ�ϤɤΥ��ꥢ��ݡ��ȤˤĤʤ��äƤ��ޤ�����"
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "�������륢�åץ��ץ����"
 
-#: ../../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 "�������� ID"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "ǧ��"
+#: ../../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 "�����ߥʥ뤫���ǧ��"
 
-#: ../../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
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "DNS �����Сʥ��ץ�����"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../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} ��Ƶ�ư���ޤ��������Ǥ��͡�"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5960,7 +5969,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."
@@ -5968,11 +5977,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."
@@ -5980,102 +5989,56 @@ 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 "���󥿡��ͥåȤؤ���³"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "���󥿡��ͥåȤ�������"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "�ͥåȥ����³ (LAN/���󥿡��ͥå�)������"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "���󥿡��ͥå���³������"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "�ͥåȥ�����ꥦ��������"
-
-#: ../../netconnect.pm_.c:812
-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 "�ɤμ����ISDN��³�Ǥ�����"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "���󥿡��ͥåȤ���³"
-
-#: ../../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 ����³����դĤ��Τ�����ϡ�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 ��Ƶ�ư���ޤ��������Ǥ��͡�"
-
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
-msgstr ""
-"�ɤ�dhcp���饤����Ȥ�Ȥ��ޤ�����\n"
-"�ǥե���Ȥ� dhcpcd�Ǥ�"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "�ͥåȥ������"
+msgid "We are now going to configure the %s connection."
+msgstr "�Ǥ� %s ��³�����ꤷ�ޤ��礦��"
 
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "�ͥåȥ����Ƶ�ư���Ƥߤޤ�����"
-
-#: ../../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 ""
-"�ͥåȥ����Ƶ�ư���˥��顼ȯ��: \n"
 "\n"
-"%s"
+"\n"
+"\n"
+"�Ǥ� %s ��³�����ꤷ�ޤ��礦��\n"
+"\n"
+"\n"
+"��OK�פ򲡤��ƻϤ�ޤ��礦��"
 
-#: ../../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 "�ͥåȥ��������"
+
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6086,7 +6049,7 @@ msgstr ""
 "���ޤ�����򤽤Τޤ޻Ȥ��ˤ� OK �򥯥�å����Ƥ����������ͥåȥ��/���󥿡�"
 "�ͥåȤ�����ꤹ��ˤϥ���󥻥�򲡤��ޤ���\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6098,72 +6061,113 @@ msgstr ""
 "�����ϥ��󥿡��ͥå�/�ͥåȥ����³�����ꤹ��Ȥ����Ǥ���\n"
 "��ư���Ф�Ȥ������ʤ���С������å���Ϥ����Ƥ���������\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "���ꤹ��ץ��ե����������"
 
-#: ../../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
 #, c-format
 msgid "detected on port %s"
 msgstr "�ݡ��� %s �Ǹ��Ф��ޤ���"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 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 "%s �򸡽�"
 
-#: ../../netconnect.pm_.c:980
-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
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "���󥿡��ե����� %s �Ǹ���"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "�����֥���³"
 
-#: ../../netconnect.pm_.c:982
+#: ../../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 "LAN ��³"
 
-#: ../../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 "�ɤΤ褦�ˤ��ƥ��󥿡��ͥåȤ���³���ޤ���?"
+#: ../../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 ""
+"���󥿡��ͥå���³��ˡ��ʣ�����ꤷ�ޤ����͡�\n"
+"�ɤ��Ȥ�������Ǥ���������\n"
+"\n"
+
+#: ../../network/netconnect.pm_.c:215
+msgid "Internet connection"
+msgstr "���󥿡��ͥå���³"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "�֡��Ȼ�����³�򳫻Ϥ��ޤ�����"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "�ͥåȥ������"
+
+#: ../../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 ""
+"�ͥåȥ����Ƶ�ư���˥��顼ȯ��: \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 ""
 "����ǤȤ��������ޤ����ͥåȥ���ȥ��󥿡��ͥå���³����λ�Ǥ���\n"
 "\n"
-"����򤳤줫�饷���ƥ��ȿ�Ǥ����ޤ���"
+"����򤳤줫�饷���ƥ��ȿ�Ǥ����ޤ���\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."
@@ -6171,30 +6175,7 @@ msgstr ""
 "���줬����ä��顢X ������ɥ��Ķ���Ƶ�ư�����ơ��ۥ���̾�ѹ���ȼ��\n"
 "�������򤷤Ƥ���������"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "�ͥåȥ�������ɤ����դ���ޤ���"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "�ͥåȥ��������"
-
-#: ../../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 ""
-"�ۥ���̾��ʬ����ʤ顢��������Ϥ��Ʋ�������\n"
-"�����Ĥ���DHCP�����Ф�ư���Τ˥ۥ���̾��ɬ�פȤ��ޤ���\n"
-"�ۥ���̾�ϡ�mybox.mylab.myco.com�ɤΤ褦�����¤��Ʋ�������"
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "�ۥ���̾:"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6205,7 +6186,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"
@@ -6215,38 +6196,38 @@ msgstr ""
 "�ơ��ι��ܤˤϥɥåȤǶ��ڤ�줿���ʿ�(�㡤1.2.3.4)��IP ���ɥ쥹�Ȥ������Ϥ�"
 "��ޤ���"
 
-#: ../../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 " (driver $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (�ɥ饤�� %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"
@@ -6257,43 +6238,147 @@ 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 "�ץ�����������"
 
-#: ../../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 "�ͥåȥ�������ɤ�id�����סʥ�åץȥåפ�������"
+
+#: ../../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 "���󥿡��ͥåȤ�����"
+
+#: ../../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 "������ mem (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 "�ץ��Х����� dns 1 (���ץ����)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "�ץ��Х����� dns 2 (���ץ����)"
+
+#: ../../network/tools.pm_.c:88
+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
+msgid "Connection timeout (in sec)"
+msgstr "��³�Υ����ॢ���ȡ��á�"
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "��������ȥ�������ʥ桼��̾��"
+
+#: ../../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 "
@@ -6303,26 +6388,21 @@ msgstr ""
 "�ɤ����Ƥ�Ȥ�������С��ץ饤�ޥ�ѡ��ƥ��������ư���ơ�̤����η��\n"
 "��ĥ�ѡ��ƥ��������٤ˤ�äƤ��ޤ��礦��"
 
-#: ../../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"
@@ -6352,49 +6432,217 @@ msgstr "����Ȥ��줷��"
 msgid "maybe"
 msgstr "���äƤ⤤��"
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr "CUPS - ���� Unix ���������ƥ�"
+
+#: ../../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 - �饤��ץ�󥿥ǡ����"
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr "PDQ - Print, Don't Queue�ʥ��塼�ʤ��ǰ�����"
+
+#: ../../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 "��������ץ��"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "��⡼�ȥץ��"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
-msgstr "��⡼�� lpd������"
+#: ../../printer.pm_.c:42
+msgid "Printer on remote CUPS server"
+msgstr "��⡼��CUPS �����о�Υץ��"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:43
+msgid "Printer on remote lpd server"
+msgstr "��⡼�� lpd�����о�Υץ��"
+
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "�ͥåȥ���ץ�󥿡ʥ����åȡ�"
 
-#: ../../printer.pm_.c:25
-msgid "SMB/Windows 95/98/NT"
-msgstr "SMB/������ɥ��� 95/98/NT"
+#: ../../printer.pm_.c:45
+msgid "Printer on SMB/Windows 95/98/NT server"
+msgstr "SMB/������ɥ��� 95/98/NT�����о�Υץ��"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+msgid "Printer on NetWare server"
+msgstr "NetWare �����о�Υץ��"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
-msgstr "�ץ�󥿥ǥХ�����URI"
+#: ../../printer.pm_.c:47
+msgid "Enter a printer device URI"
+msgstr "�ץ�󥿥ǥХ�����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
+#, 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
+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"
+"��⡼�� CUPS �����о�Υץ�󥿤ϡ������Ǥ��������פǤ���\n"
+"�ץ�󥿤ϼ�ư���Ф���ޤ����⤷���ѤǤ��ʤ��Ȼפä��顢\n"
+"�֥�⡼��CUPS �����Сפ����Ӥޤ��礦��"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../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
+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 ""
+"��⡼�Ȥ� CUPS �����Фʤ顢�����Ǥϥץ����������פǤ���\n"
+"CUPS �����Фϥޥ���˼�ưŪ�˥ץ�󥿾�����Ϥ��ޤ������ޡ�\n"
+"���ʤ��Υޥ����ΤäƤ���ץ�󥿤� \"�ǥե���ȥץ��\"\n"
+"�˽ФƤ��ޤ����ޥ���Υǥե���ȥץ�󥿤�����ǡ�\n"
+"\"�ץ�󥿤�Ŭ��/���ɹ�\" �ܥ���򲡤��Ƥ��������������ι���\n"
+"�ˤ⤳�Υܥ���򲡤��ޤ��ʥ�⡼�ȥץ�󥿤�������ޤǡ�CUPS \n"
+"���Ϥ������30�ä�����ޤ���\n"
+"CUPS �����Ф��̤Υͥåȥ���ˤ���ʤ顢CUPS�����Ф�IP���ɥ쥹\n"
+"�ȡ����ˤ�äƤϥݡ����ֹ����ꤷ�ʤ��ȥ����Ф���ץ�󥿾�\n"
+"�󤬤�館�ޤ��󡣤����Ǥʤ���С������϶���ˤ��ޤ���"
+
+#: ../../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 ""
+"\n"
+"�̾�ϡ�CUPS �ϼ�ưŪ�˥ͥåȥ���Ķ��ˤ��碌�����ꤵ��ơ�\n"
+"��������ͥåȥ���� CUPS �����о�Υץ�󥿤˥��������Ǥ���\n"
+"�褦�ˤʤ�ޤ����Ǥ���������ǽ���ʤ��ʤ顢�ּ�ưCUPS����פ�\n"
+"���դˤ��ơ�/etc/cups/cupsd.conf ���ǽ񤭴����Ƥ��ޤ���\n"
+"����ä��顢CUPS ��Ƶ�ư����Τ�˺��ʤ���\n"
+"�ʥ��ޥ��: \"service cups restart\")."
+
+#: ../../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
+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
+msgid "Default printer"
+msgstr "�ǥե���ȥץ��"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "CUPS �����Ф�IP"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "�ݡ���"
+
+#: ../../printerdrake.pm_.c:149
+msgid "Automatic CUPS configuration"
+msgstr "��ư CUPS ����"
+
+#: ../../printerdrake.pm_.c:217
+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"
@@ -6402,36 +6650,53 @@ 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
+msgid "Reading printer database ..."
+msgstr "�ץ�󥿥ǡ����١������ɤ�Ǥ��ޤ�..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "��⡼��lpd�ץ�󥿥��ץ����"
 
-#: ../../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 ""
-"��⡼�Ȥ� lpd �� �ץ��ȥ��塼��Ȥ��ˤϡ��ץ�󥿥����ФΥۥ���̾��\n"
-"����֤��֤���륵���о�Υ��塼��̾����ɬ�פˤʤ�ޤ���."
+"��⡼�Ȥ� lpd �� �ץ��ȥ��塼��Ȥ��ˤϡ��ץ�󥿥����Ф�\n"
+"�ۥ���̾�ȥ����о�Υץ��̾��ɬ�פˤʤ�ޤ���."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+msgid "Remote host name"
 msgstr "��⡼�ȥۥ���̾"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "��⡼�ȥ��塼"
+#: ../../printerdrake.pm_.c:317
+msgid "Remote printer name"
+msgstr "��⡼�ȥץ��̾"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:320
+msgid "Remote host name missing!"
+msgstr "��⡼�ȥۥ���̾������ޤ���"
+
+#: ../../printerdrake.pm_.c:324
+msgid "Remote printer name missing!"
+msgstr "��⡼�ȥۥ���̾������ޤ���"
+
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (������ɥ��� 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"
@@ -6443,29 +6708,37 @@ msgstr ""
 "¿ʬ�ץ��ȥ����Ф� IP ���ɥ쥹�����������������ץ�󥿤ζ�ͭ̾��\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 "SMB�����Ф�IP"
 
-#: ../../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."
@@ -6475,297 +6748,922 @@ 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 "�����åȥץ�󥿤Υ��ץ����"
 
-#: ../../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 ""
 "�����åȥץ�󥿤ǰ�������ʤ顢�ץ�󥿤Υۥ���̾�ȡ�����\n"
-"��äƤϥݡ����ֹ椬ɬ�פˤʤ�ޤ���"
+"��äƤϥݡ����ֹ椬ɬ�פˤʤ�ޤ���HP JetDirect �����ФǤϡ��ݡ����ֹ���̾�"
+"9100�Ǥ������ۤ���\n"
+"�����Ф��Ȥޤ��ޤ��Ǥ����ϡ��ɥ������Υޥ˥奢��򸫤ޤ��礦��"
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+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:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "�ץ�󥿥ǥХ�����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 ""
+"�ץ�󥿤򥢥���������Τ�ľ�� URI ����ꤹ�뤳�Ȥ�Ǥ��ޤ�������URI��CUPS��"
+"�ͤ�Foomatic���ͤǻ��ꤷ�Ƥ����������ʤ������٤Ƥ�URI�����פ������ס���ǥ�"
+"�ݡ��Ȥ���Ƥ���櫓����ʤ��Ǥ���"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "CUPS �ǥץ�󥿤򥢥���������ʤ顢ľ�� URI �����Ǥ��ޤ���"
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr "ͭ����URI�����Ϥ��Ƥ���������"
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
-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 ""
+"�ץ�󥿤Ϥ��줾��ʤޤ���ɬ�פǤ��ʤ��Ȥ��� lp��\n"
+"�����������϶���Ǥ⤫�ޤ��ޤ��󡣤����\n"
+"�桼���ˤ狼��䤹�����뤿��Τ�ΤǤ���"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "�������ޤ�����"
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "�ץ�󥿤�̾��"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "�ץ�󥿤�����"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "�ץ�󥿤ξ��"
+
+#: ../../printerdrake.pm_.c:701
+msgid "Preparing printer database ..."
+msgstr "�ץ�󥿥ǡ����١����������..."
+
+#: ../../printerdrake.pm_.c:793
+msgid "Printer model selection"
+msgstr "�ץ�󥿤ε��������"
+
+#: ../../printerdrake.pm_.c:794
+msgid "Which printer model do you have?"
+msgstr "�ɤε���Υץ�󥿤�ȤäƤ��ޤ�����"
+
+#: ../../printerdrake.pm_.c:866
+msgid "OKI winprinter configuration"
+msgstr "OKI win�ץ�󥿤�����"
+
+#: ../../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 ""
+"OKI �Υ졼��win�ץ�󥿤����ꤷ�褦�Ȥ��Ƥ��ޤ��͡�����\n"
+"�ץ�󥿤������ü�ʥץ��ȥ����Ȥ��Τǡ��ǽ�Υѥ���\n"
+"�ݡ��ȤˤĤʤ��ʤ��ȵ�ǽ���ޤ��󡣤⤷�̤Υݡ��Ȥ���³����\n"
+"�Ƥ����ꡢ�ץ�󥿥����ФˤĤʤ��äƤ����ꤹ����ˤϡ���\n"
+"���ȥڡ������������ˡ��ǽ�Υѥ���ݡ��ȤˤĤʤ��ʤ�����\n"
+"��������������ʤ��ȻȤ��ޤ�����³����������̵�뤵���\n"
+"����"
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+msgid "Lexmark inkjet configuration"
+msgstr "Lexmark���󥯥����åȤ�����"
+
+#: ../../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 ""
+"Lexmark���󶡤��륤�󥯥����åȥץ�󥿥ɥ饤�Фϡ���������\n"
+"�ץ�󥿤������ݡ��Ȥ��ޤ��󡣥�⡼�ȥޥ����ץ�󥿥�����\n"
+"��Υץ�󥿤ϻȤ��ޤ��󡣥ץ�󥿤��������ݡ��ȤˤĤʤ���\n"
+"��³����Ƥ���ޥ�������ꤷ�Ƥ���������"
+
+#: ../../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 ""
+"Lexmark ���󥯥����åȤȤ�������ǰ�������ˤϡ�Lexmark\n"
+"(http://www.lexmark.com/) ���󶡤��륤�󥯥����åȥץ��\n"
+"�ɥ饤�Ф�ɬ�פǤ�������ꥫ�����Ȥ˹Ԥäơ��֥ɥ饤�Сפ�\n"
+"����å����ޤ��礦�����줫�鼫ʬ�ε��������ǡ�OS�����\n"
+"\"Linux\" �����Ӥޤ����ɥ饤�Ф� RPM �ѥå�������������\n"
+"�ե��å����󥹥ȡ����ѤΥ����륹����ץȤˤʤäƤ��ޤ���\n"
+"��������ϥ���ե��å��ե���ȥ���ɤ�Ȥ�ʤ��Ƥ�Ǥ��ޤ���\n"
+"�饤����Ʊ�դΤ��ȤǤ����˥���󥻥뤷�Ƥ������������줫��\n"
+"�����إåɤΥ��饤����ȥڡ�����\"lexmarkmaintain\" �ǰ���\n"
+"���ơ����Υץ������ǥإåɤΥ��饤����Ȥ�Ĵ�����ޤ���"
+
+#: ../../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 ""
+"�ץ�󥿤Υǥե��������\n"
+"�ڡ������礭���ȥ��󥯤μ���ʳ���������Τߡˤ�\n"
+"���������ꤵ��Ƥ��뤫���ǧ���ޤ��礦���ʤ���Ķ��\n"
+"�ʼ������Ϥ��������֤������뤳�Ȥ�����ޤ���"
+
+#: ../../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
+#, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
+msgstr ""
+"���Υץ�� (\"%s\") ��\n"
+"�ǥե���ȥץ�󥿤ˤ��ޤ�����"
+
+#: ../../printerdrake.pm_.c:1152
+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 ""
+"�����������ƥ��ȥڡ���������Ǥ���������\n"
+"�����̿��ƥ��ȥڡ����ϡ������ˤ��ʤ���֤������뤳�Ȥ�����ޤ�����\n"
+"����ξ��ʤ��졼���ץ�󥿤ǤϽ��ϤǤ��ʤ����Ȥ⤢��ޤ���\n"
+"¿���ξ���ɸ��ڡ����������Ǥ��������פǤ���"
+
+#: ../../printerdrake.pm_.c:1158
+msgid "No test pages"
+msgstr "�ƥ��ȥڡ����ʤ�"
+
+#: ../../printerdrake.pm_.c:1159
+msgid "Print"
+msgstr "����"
+
+#: ../../printerdrake.pm_.c:1161
+msgid "Standard test page"
+msgstr "ɸ��ƥ��ȥڡ���"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr "�̤Υƥ��ȥڡ��� (�쥿��)"
+
+#: ../../printerdrake.pm_.c:1167
+msgid "Alternative test page (A4)"
+msgstr "�̤Υƥ��ȥڡ��� (A4)"
+
+#: ../../printerdrake.pm_.c:1169
+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
+#: ../../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 ""
 "�ƥ��ȥڡ�����ץ�󥿥ǡ���������ޤ�����\n"
 "�ץ�󥿤�ư���Ф��ޤǡ�����äȻ��֤�������ޤ���\n"
 "�����Υ��ơ�������\n"
 "%s\n"
 "\n"
-"�����Ƚ��Ϥ���ޤ�������"
 
-#: ../../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 ""
 "�ƥ��ȥڡ�����ץ�󥿥ǡ���������ޤ�����\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 "PostScript�ƥ��ȥڡ�����������Ƥߤ�"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+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 ""
+"���ޥ�ɥ饤��ʥ����ߥʥ륦����ɥ��ˤ���ե�������������ˤϡ�\n"
+"���ޥ�ɡ�%s <file>�פ�������ե��å������ġ���: ��xpp <file>�פ�\n"
+"��qtcups <file>�פ�Ȥ��ޤ�������ե��å��ġ���ϡ�\n"
+"�ץ������ȥ��ץ����������ñ�ˤ��Ƥ���ޤ���\n"
 
-#: ../../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 ""
+"�����������ޥ�ɤϡ�¿���Υ��ץꥱ�������ΰ������������������\n"
+"�ְ������ޥ�ɡץե�����ɤǤ�Ȥ��ޤ��������ξ��ϥե�����̾���פ�ޤ�"
+"��\n"
+"��������ե�����ϥ��ץꥱ������󤫤餯�뤫��Ǥ���\n"
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
-msgstr "�ץ�󥿥��ץ����"
+#: ../../printerdrake.pm_.c:1242 ../../printerdrake.pm_.c:1254
+#: ../../printerdrake.pm_.c:1266
+msgid ""
+"\n"
+"The \"%s\" command also allows to modify the option settings for a "
+"particular printing job. Simply add the desired settings to the command "
+"line, e. g. \"%s <file>\". "
+msgstr ""
+"\n"
+"��%s�ץ��ޥ�ɤϤޤ�����������֤��Ȥ˥��ץ����������Ѥ������Ƥ���ޤ���\n"
+"���ޥ�ɥ饤��˴�˾��������ɲä�������Ǥ���\n"
+"���Ȥ��С�%s <file>�פȤ������Ǥ��� "
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-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 ""
+"���ޤΥץ�󥿤ǻȤ��륪�ץ��������򸫤�ˤϡ����ΰ������ɤफ��\n"
+"���뤤�ϡ֥��ץ�������������ץܥ���򥯥�å����ޤ��礦��\n"
+"\n"
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-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 ""
+"���ޥ�ɥ饤��ʥ����ߥʥ륦����ɥ��ˤ���ե�������������ˤϡ�\n"
+"���ޥ�ɡ�%s <file>�פ�Ȥ��ޤ���\n"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Uniprint�ɥ饤�Х��ץ����"
+#: ../../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 ""
+"�����������ޥ�ɤϡ�¿���Υ��ץꥱ�������ΰ������������������\n"
+"�ְ������ޥ�ɡץե�����ɤǤ�Ȥ��ޤ��������ξ��ϥե�����̾���פ�ޤ�"
+"��\n"
+"��������ե�����ϥ��ץꥱ������󤫤餯�뤫��Ǥ���\n"
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-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 ""
+"���ޤΥץ�󥿤ǻȤ��륪�ץ��������򸫤�ˤϡ����ΰ������ɤफ��\n"
+"���뤤�ϡ֥��ץ�������������ץܥ���򥯥�å����ޤ��礦��\n"
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "�ƥ����Ȥ�PostScript�ǰ������ޤ�����"
+#: ../../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 ""
+"���ޥ�ɥ饤��ʥ����ߥʥ륦����ɥ��ˤ���ե�������������ˤϡ�\n"
+"���ޥ�ɡ�%s <file>�פޤ��ϡ�%s <file>�פ�Ȥ��ޤ���\n"
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-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 ""
+"�ޤ����ץ����������������֤ν����ˤϥ���ե��å��Ρ�xpdq�פ�Ȥ��ޤ���\n"
+"�ǥ����ȥå״Ķ��� KDE �ʤ顢�֥ѥ˥å��ܥ���פȤ����������󤬥ǥ����ȥå�"
+"��\n"
+"����Ǥ��礦������򥯥�å�����ȡ���������֤����������˻ߤޤ�ޤ���\n"
+"����Ϥ��Ȥ��л�ͤޤ�ΤȤ��������Ǥ���\n"
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-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 ""
+"\n"
+"��%s�פȡ�%s�ץ��ޥ�ɤϤޤ�����������֤��Ȥ˥��ץ���������\n"
+"�Ѥ������Ƥ���ޤ������ޥ�ɥ饤��˴�˾��������ɲä�������Ǥ���\n"
+"���Ȥ��С�%s <file>�פȤ������Ǥ���\n"
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "������;���ݥ���ȿ���1/72������ˤǻ���"
+#: ../../printerdrake.pm_.c:1292
+#, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "�ʲ��Υץ�󥿤ǰ����桧 \"%s\""
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "�岼��;���ݥ���ȿ���1/72������ˤǻ���"
+#: ../../printerdrake.pm_.c:1294
+msgid "Print option list"
+msgstr "�ץ�󥿥��ץ�������"
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "����¾ GhostScript���ץ����"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+msgid "Reading printer data ..."
+msgstr "�ץ�󥿤ξ�����ɤ�Ǥ��ޤ�..."
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "����¾�ƥ����ȥ��ץ����"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+msgid "Transfer printer configuration"
+msgstr "�ץ�󥿤�������ư"
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "�Ǹ�Υڡ����������"
+#: ../../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 ""
+"���ס��� %s ���餤�ޤΥ��ס��� %s �ء��ץ�󥿤�������ư�Ǥ��ޤ���\n"
+"����ǡ������٤ơʥץ��̾����������ꡢ��³���ࡢ�ǥե���Ȥ�\n"
+"���ץ��������ˤϤ�����˼���ޤ���������֤ϰ�ư���ޤ���\n"
+"�ʲ�����ͳ�ǡ���ư�Ǥ��ʤ����塼�⤢��ޤ���\n"
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-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 ""
+"CUPS �� Novell �����ФΥץ�󥿤䡢��ͳ�����Υ��ޥ�ɤ˥ǡ���\n"
+"������ץ�󥿤ϥ��ݡ��Ȥ��ޤ���\n"
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1350
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
 msgstr ""
-"�ʲ��ΰ������塼������ޤ���\n"
-"�������塼���ɲá��ѹ��Ǥ��ޤ���"
+"PDQ �ϥ�������ץ�󥿤ȥ�⡼�Ȥ� LPD �ץ�󥿡������å�/TCP \n"
+"�ץ�󥿤������ݡ��Ȥ��ޤ���\n"
+
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr "LPD �� LPRng ��IPP �ץ�󥿤򥵥ݡ��Ȥ��ޤ���\n"
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS ����"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
+"����ˤ��Υץ�������\"foomatic-configure\" �Ǻ�äƤ��ʤ�\n"
+"���塼�ϰ�ư�Ǥ��ޤ���"
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
-msgstr "CUPS �ɥ饤�Хǡ����١������ɤ�Ǥ��ޤ�..."
+#: ../../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 ""
+"\n"
+"�ޤ��᡼�����󶡤� PPD �ե������ͥ��ƥ��֤� CUPS �ɥ饤��\n"
+"�����ꤵ�줿�ץ�󥿤ϰ�ư�Ǥ��ޤ���"
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "�ץ�󥿤���³������Ǥ�������"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
+"\n"
+"��ư�������ץ�󥿤������ \"T��ư\"�򥯥�å����Ƥ���������"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "�ץ�󥿤Ϥɤ��Ĥʤ��äƤ��ޤ�����"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr "�ץ�󥿤��ư���ʤ�"
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "��⡼�ȥץ�󥿤���³������Ǥ�������"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr "��ư"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1377
+#, 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\"."
+"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 ""
-"��⡼�� CUPS �����Фξ�硢�����Ǥϥץ�󥿤���������פǤ���\n"
-"�ץ�󥿤ϼ�ư���Ф���ޤ����⤷���ѤǤ��ʤ��Ȼפä��顢\n"
-"�֥�⡼��CUPS �����Сפ����Ӥޤ��礦��"
+"\"%s\" �Ȥ����ץ�󥿤Ϥ��Ǥ� %s �β���¸�ߤ��ޤ���\n"
+"��񤭤���ˤ� \"��ư\" �򲡤��Ƥ���������\n"
+"������̾���򥿥��פ��뤫�����Υץ�󥿤�ȤФ����Ȥ�Ǥ��ޤ���"
+
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "�ץ��̾�ϡ�ʸ���ȿ����ȥ������������ (_)�����Ȥ��ޤ���"
 
-#: ../../printerdrake.pm_.c:416
+#: ../../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"
-"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 printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
 msgstr ""
-"��⡼�� CUPS �����Фξ�硢�����Ǥϥץ�󥿤���������פǤ���\n"
-"�ץ�󥿤ϼ�ư���Ф���ޤ��������������Ф��̤Υͥåȥ�����\n"
-"����ȥ���Ǥ������ΤȤ��ϡ�CUPS�����Ф�IP���ɥ쥹�ȡ�ɬ�פʤ�\n"
-"�ݡ����ֹ����ꤷ�ޤ��礦��"
+"�ץ�� \"%s\" �Ϥ��Ǥ�¸�ߤ��ޤ���\n"
+"���ޤ�������񤭤��Ƥ��ޤ��ޤ�����"
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "CUPS �����Ф�IP"
+#: ../../printerdrake.pm_.c:1398
+msgid "New printer name"
+msgstr "�������ץ�󥿤�̾��"
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
-msgstr "�ݡ����ֹ�Ͽ����Ǥ���"
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr "%s ��ư��ġ�"
+
+#: ../../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 ""
+"���Υǥե���ȥץ�� (\"%s\")���ư���ޤ�����\n"
+"����Ͽ��������������ƥ�%s�Ǥ�ǥե���ȤΥץ�󥿤�\n"
+"���ޤ�����"
+
+#: ../../printerdrake.pm_.c:1423
+msgid "Refreshing printer data ..."
+msgstr "�ץ�󥿥ǡ���������..."
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "���塼�κ��"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+msgid "Configuration of a remote printer"
+msgstr "��⡼�ȥץ�󥿤�����"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1432
+msgid "Starting network ..."
+msgstr "�ͥåȥ����ư��..."
+
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+msgid "Configure the network now"
+msgstr "�������ͥåȥ������򤹤�"
+
+#: ../../printerdrake.pm_.c:1455
+msgid "Network functionality not configured"
+msgstr "�ͥåȥ����ǽ�����ꤵ��Ƥޤ���"
+
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
-msgstr "�ץ��̾�ϡ�ʸ���ȿ����ȥ������������ (_)�����Ȥ��ޤ���"
+"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 ""
+"��⡼�ȥץ�󥿤�����򤷤ޤ�������ϥͥåȥ�����������β�Ư\n"
+"��ɬ�ܤǤ��������ʤ��Υͥåȥ������Ϥ���Ǥ��ޤ��󡣥ͥå�\n"
+"�������ʤ��ǿʤ�ȡ�����������Υץ�󥿤ϻȤ��ޤ��󡣤���\n"
+"�ɤ��ʤ�ޤ��礦����"
+
+#: ../../printerdrake.pm_.c:1463
+msgid "Go on without configuring the network"
+msgstr "�ͥåȥ���������ȤФ�����˿ʤ�"
 
-#: ../../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 ""
-"�ץ�󥿤Ϥ��줾��̾�����פ�ޤ��ʤ��Ȥ���lp)��\n"
-"�ۤ��ˤ⡢�ץ�󥿤μ����ޥ���ؤΤĤʤ��꤫���ʤɤΥѥ�᡼����\n"
-"����Ǥ��ޤ������Υץ�󥿤Ϥʤ�Ȥ���̾���ˤ��ޤ����� �����ƥޥ���ȤϤɤ���"
-"�ʤ��äƤ��ޤ�����"
+"���󥹥ȡ�����ˤ�ä��ͥåȥ�����꤬��ư�Ǥ��ޤ���\n"
+"��ư���˥ͥåȥ����ͭ���ˤʤäƤ��뤫Ĵ�٤ơ�ɬ�פʤ�\n"
+"Mandrake����ȥ����륻�󥿤Ρ֥ͥåȥ��&���󥿡��ͥå�/\n"
+"��³�פ���ʬ�������ʤ����Ƥ������������줬����Ǥ��顢\n"
+"Ʊ����Mandrake����ȥ����륻�󥿤Ρ֥ϡ��ɥ�����/�ץ�󥿡�\n"
+"����ʬ�ǥץ�󥿤�����򤷤ޤ��礦��"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of 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 ""
+"�ͥåȥ����������������Ƥ��ơ���ư�Ǥ��ޤ���Ǥ�����\n"
+"�ϡ��ɥ����������������å����Ƥ������������줫���⡼��\n"
+"�ץ�󥿤��������ʤ����Ƥ���������"
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "�ץ�󥿤�����"
+#: ../../printerdrake.pm_.c:1516
+msgid "Restarting printing system ..."
+msgstr "�ץ�󥿥����ƥ�Ƶ�ư��..."
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "�ץ�󥿤ξ��"
+#: ../../printerdrake.pm_.c:1548
+msgid "high"
+msgstr "�⤤"
+
+#: ../../printerdrake.pm_.c:1548
+msgid "paranoid"
+msgstr "���м��ʤۤɹ���"
+
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr "���������ƥ�򥻥����ƥ���� %s �ǥ��󥹥ȡ�����"
+
+#: ../../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 ""
+"���줫�顢���������ƥ� %s �򥻥����ƥ���� %s �Υޥ����\n"
+"���󥹥ȡ��뤷�ޤ���\n"
+"\n"
+"���ΰ��������ƥ�ϡ��ǡ����ʥХå����饦��ɤΥץ�������\n"
+"��¹Ԥ��ޤ�������ϰ�������֤��Ԥäơ����줬�����������\n"
+"�ޤ������Υǡ����ϥͥåȥ����ͳ�ǡ���⡼�ȥޥ��󤫤�\n"
+"�⥢�������Ǥ���Τǡ����⤵����ǽ��������ޤ����Ǥ�����\n"
+"���Υ������ƥ����Ǥϡ��ǥե���Ȥǵ�ư����ǡ����Ϥ�\n"
+"�������Ǥ���\n"
+"\n"
+"���Υޥ���ǰ���������������ˤ�äƤ����Ǥ��͡�"
+
+#: ../../printerdrake.pm_.c:1584
+msgid "Starting the printing system at boot time"
+msgstr "��ư���˰��������ƥ�򥹥�����"
+
+#: ../../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 ""
+"���������ƥ� (%s) �ϡ��ޥ���ư���˼�ư�������Ȥ��ޤ���\n"
+"\n"
+"�������ƥ�����夲������ˡ���ư�������Ȥ�̵���ˤʤä�\n"
+"�Τ��⤷��ޤ��󡣰��������ƥ�ϡ����⤵����ǽ�������뤫��\n"
+"�Ǥ���\n"
+"\n"
+"���������ƥ�μ�ư�������Ȥ�⤦����ͭ���ˤ��ޤ�����"
+
+#: ../../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 "LPRng �����ġ�"
+
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr "LPD �����ġ�"
+
+#: ../../printerdrake.pm_.c:1727
+msgid "Select Printer Spooler"
+msgstr "�ץ�󥿤Υ��ס��������Ǥ�������"
+
+#: ../../printerdrake.pm_.c:1728
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "�ɤΰ��������ƥ�ʥ��ס���ˤ�Ȥ��ޤ�����"
+
+#: ../../printerdrake.pm_.c:1759
+#, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "�ץ�� \"%s\" ��������..."
+
+#: ../../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������..."
+
+#: ../../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 ""
+"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"
+"�ѹ������򻲾Ȥ���ˤϡ����Υץ�󥿤�\n"
+"����å����ޤ����ޤ����������ץ�󥿤�\n"
+"�ɲäˤϡ֥ץ���ɲáפ򥯥�å����ޤ���"
+
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "�Ρ��ޥ�⡼��"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (�ǥե����)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "��⡼��CUPS �����о�Υץ��"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+msgid "Printer(s) on remote server(s)"
+msgstr "��⡼�ȥ����о�Υץ��"
+
+#: ../../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
+msgid "Do you want to configure another printer?"
+msgstr "�̤Υץ�󥿤����ꤷ�ޤ�����"
+
+#: ../../printerdrake.pm_.c:2003
+msgid "Modify printer configuration"
+msgstr "�ץ��������ѹ�"
+
+#: ../../printerdrake.pm_.c:2004
+#, c-format
+msgid ""
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
+msgstr ""
+"Printer %s: %s %s\n"
+"���Υץ�󥿤β����ѹ����ޤ�����"
+
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr "��졪"
+
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+msgid "Printer connection type"
+msgstr "�ץ����³�μ���"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+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
+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
+msgid "Remove printer"
+msgstr "�ץ�󥿺��"
+
+#: ../../printerdrake.pm_.c:2071
+#, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "�Ť��ץ�� \"%s\" ������..."
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr "�ץ�� %s ���ǥե���ȥץ�󥿤ˤʤ�ޤ�����"
+
+#: ../../printerdrake.pm_.c:2103
+#, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "�ץ�� %s �������˺�����ޤ�����"
+
+#: ../../printerdrake.pm_.c:2105
+#, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "�ץ�� \"%s\" ������..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "�ץ�����������"
+
+#: ../../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 ""
+"�ץ���������桼�ƥ���ƥ��ؤ���ä��㤤�ޤ�����\n"
+"\n"
+"�����Ǥ� http �� ftp �Υץ����������ꤷ�ޤ���\n"
+"���������ѥ���ɤ⡢ɬ�פʤ�����Ǥ��ޤ���\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 �ץ�������������Ϥ��Ƥ�������\n"
+"http proxy��Ȥ�ʤ��ʤ����ˤ��Ƥ����Ƥ�������"
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr "URL"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../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 ""
-"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 fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
 msgstr ""
-"������ץ��ȥ��塼(�ץ��ȥ���֤����������)��̾��(�����Ƥ���\n"
-" lp)�Ȥ���˴�Ϣ���Ƥ��륹�ס���ǥ��쥯�ȥ꤬ɬ�פǤ������Υ��塼��\n"
-"�Ȥ�̾���ȥǥ��쥯�ȥ�ϲ��ˤ��ޤ�����\n"
-"�ޤ��ץ�󥿤Ϥɤ���³����Ƥ��ޤ�����"
+"ftp �ץ�������������Ϥ��Ƥ�������\n"
+"ftp proxy��Ȥ�ʤ��ʤ����ˤ��Ƥ����Ƥ�������"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "���塼��̾����"
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "Url �� ftp://... �ǤϤ��ޤ�ޤ�"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "���ס���Υǥ��쥯�ȥꡧ"
+#: ../../proxy.pm_.c:79
+msgid ""
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
+msgstr ""
+"�ץ������Υ�������̾�ȥѥ���ɤ���������Ϥ��ޤ���\n"
+"��������/�ѥ���ɤ��ʤ���ж���ΤޤޤǤ�"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "�ץ�󥿤���³����"
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "��������"
 
-#: ../../raid.pm_.c:33
+#: ../../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 (���Linux ������ɥ������ƥ�����) ������ɥ����ƥ൯ư"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
-msgstr "Anacron �ϼ���Ū�ʥ��ޥ�ɥ������塼��Ǥ���"
+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."
@@ -6773,7 +7671,7 @@ msgstr ""
 "apmd �ϥХåƥ꡼�ξ��֤�Ĵ�٤Ƥ����syslog��ͳ�ǵ�Ͽ���ޤ���\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."
@@ -6781,7 +7679,7 @@ msgstr ""
 "at���ޥ�ɤǥ������塼�뤵�줿���ޥ�ɤ�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 "
@@ -6792,7 +7690,7 @@ msgstr ""
 "�¹Ԥ��ޤ���vixie cron��ɸ���UNIX cron�˹��٤ʥ������ƥ���\n"
 "���Ϥ����ꥪ�ץ����ʤɤε�ǽ���ɲä��Ƥ��ޤ���"
 
-#: ../../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 "
@@ -6803,19 +7701,21 @@ msgstr ""
 "�Ȥ���褦�ˤ��ޤ����ޥ����ˤ�륳�󥽡���ǤΥ��åȡ��ڡ�����\n"
 "�䡢�ݥåץ��åץ�˥塼��Ȥ��ޤ���"
 
-#: ../../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."
 msgstr "Apache��World Wide Web�����Фǡ�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 "
@@ -6829,13 +7729,15 @@ msgstr ""
 "rsh��rlogin�ʤɤΥ����ӥ����Ϥ�ô�����ޤ���inetd��̵���ˤ���ȡ�\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 ""
+"�ͥåȥ�����⤫��ޥ�����뤿��Υե����������������\n"
+"���ꤹ��ˤϡ�Linux �����ͥ�2.2 �Υѥ��åȥե��륿��ư���ޤ���"
 
-#: ../../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"
@@ -6845,23 +7747,27 @@ msgstr ""
 "�����ɤ��ޤ��������kbdconfig�桼�ƥ���ƥ���Ȥä����ꤷ�ޤ����̾��\n"
 "ͭ���ˤ��Ƥ����ޤ��礦��"
 
-#: ../../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"
+"/boot �Υ����ͥ�إå�����������ޤ�"
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
-msgstr ""
+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)."
@@ -6869,13 +7775,15 @@ msgstr ""
 "lpd �ϥץ�󥿥ǡ����ǡ�lpr��ư���ɬ�פǤ�������Ū��\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 �С�����륵���Фϡ�����ǽ�Ǥ��ĤǤ�Ȥ��륵���Ф�\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."
@@ -6883,7 +7791,7 @@ msgstr ""
 "named (BIND) �ϡ�IP���ɥ쥹�ȥۥ���̾���ӤĤ��뤿��Υɥᥤ��̾\n"
 "�����С�Domain Name Server, 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."
@@ -6891,7 +7799,7 @@ msgstr ""
 "�ͥåȥ���ե����륷���ƥ� (NFS), SMB (LanManager/Windows),\n"
 "NCP (NetWare) �ޥ���ȥݥ���Ȥ򤹤٤ƥޥ���ȡ�����ޥ���Ȥ��ޤ���"
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6899,7 +7807,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"
@@ -6909,7 +7817,7 @@ msgstr ""
 "�Ǥ������Υ����ӥ��� NFS �����е�ǽ���󶡤��ޤ�������ˤ�/etc/exports \n"
 "�ե������Ȥ��ޤ���"
 
-#: ../../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."
@@ -6917,17 +7825,17 @@ msgstr ""
 "NFS ��TCP/IP�ͥåȥ����ǥե����붦ͭ�򤹤�Τˤ褯�Ȥ��ץ��ȥ���\n"
 "�Ǥ������Υ����ӥ��� NFS �ե�������å���ǽ���󶡤��ޤ���"
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
-msgstr ""
+msgstr "��ư���˥��󥽡���� XFree �Ǽ�ưŪ�� numlock ��ͭ���ˤ��롣"
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr ""
+msgstr "OKI 4w �ߴ���win�ץ�󥿤򥵥ݡ���"
 
-#: ../../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 "
@@ -6938,7 +7846,7 @@ msgstr ""
 "�ʤɤ�PC�����ɤ�Ȥ���褦�ˤ��뤿��Τ�ΤǤ������ꤹ��ޤ�\n"
 "�ϵ�ư���ʤ��Τǡ�ɬ�פʤ��ޥ��������Ƥ��äƤ�����Ǥ���"
 
-#: ../../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 "
@@ -6949,7 +7857,7 @@ msgstr ""
 "���Ѥ���ޤ���RPC������Ȥ��ץ��ȥ���Υ����ФȤʤ�ޥ���Ǥϡ�����\n"
 "portmap �����Ф�ư���Ƥ���ɬ�פ�����ޤ���"
 
-#: ../../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."
@@ -6957,7 +7865,7 @@ msgstr ""
 "Postfix �ϥ᡼��ž������������ȤǤ� (MTA) �Ǥ�������ϡ��ޥ���֤�\n"
 "�᡼�����Ȥꤹ��ץ������Ǥ���"
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6965,13 +7873,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 ""
+"Oracle �ʤɤΥ��ץꥱ�������ǻȤ���褦�ˡ��֥��å��ǥХ���\n"
+"���Ȥ��Хϡ��ɥɥ饤�֥ѡ��ƥ������ˤ����ǥХ����˳��Ĥ��ޤ���"
 
-#: ../../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"
@@ -6981,7 +7891,7 @@ msgstr ""
 "��ǽ�ˤ��ޤ���RIP �Ͼ����ϥͥåȥ���Ǥ������Ǥ褯�Ȥ��ޤ�����\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."
@@ -6989,7 +7899,7 @@ msgstr ""
 "rstat�ץ��ȥ����Ȥ��ȡ��ͥåȥ����Υ桼���������Υͥåȥ��\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."
@@ -6997,7 +7907,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)."
@@ -7005,12 +7915,11 @@ msgstr ""
 "rwho �ǡ�������äƤ���ޥ���Ǥϡ����Υޥ���˥����������\n"
 "�桼��������rwho�ץ��ȥ����ͳ�Ǹ����ޤ� (finger�˻��Ƥ��ޤ�)��"
 
-#: ../../services.pm_.c:85
-#, fuzzy
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
-msgstr "��ư���� X ������ɥ���¹�"
+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."
@@ -7018,32 +7927,64 @@ msgstr ""
 "Syslog �ϡ��Ƽ�Υǡ���󤬤�����ʥ����ե�����˥�å�������Ͽ\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 "��ư��/����åȥ�������ˡ�X�ե���ȥ����Ф򳫻�/��ߤ��ޤ���"
+msgstr "X�ե���ȥ����Ф򳫻Ϥ��ޤ���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 "��ư���˼�ưŪ�ˤ��������륵���ӥ�������Ǥ�������"
 
+#: ../../services.pm_.c:126
+msgid "Printing"
+msgstr "����"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "���󥿡��ͥå�"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr "�ե����붦ͭ"
+
+#: ../../services.pm_.c:132
+msgid "System"
+msgstr "�����ƥ�"
+
 #: ../../services.pm_.c:137
+msgid "Remote Administration"
+msgstr "��⡼�ȴ���"
+
+#: ../../services.pm_.c:145
+msgid "Database Server"
+msgstr "�ǡ����١���������"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr "�����ӥ�: %d �� %d �Ѥ˵�ư�����Τ���Ͽ"
+
+#: ../../services.pm_.c:186
+msgid "Services"
+msgstr "�����ӥ�"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "�¹���"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 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."
@@ -7051,11 +7992,15 @@ msgstr ""
 "���Υ����ӥ��ˤĤ��Ƥϡ��ɲä�\n"
 "����Ϥ���ޤ��󡣤����ʤ�����"
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "��ư����ư��"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+msgid "Installing packages..."
+msgstr "�ѥå������Υ��󥹥ȡ�����..."
+
+#: ../../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"
@@ -7063,15 +8008,76 @@ 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 "ɬ�פʲ����ե����� %s �����Ĥ���ޤ���"
+
+#: ../../standalone/drakautoinst_.c:47
+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 ""
+"���줫�鼫ư���󥹥ȡ���ե��åԡ������ꤷ�ޤ������ε�ǽ�Ϥ������������ʤΤ�"
+"���Ť˻ȤäƤ���������\n"
+"\n"
+"���ε�ǽ�Ǥϡ����Υ���ԥ塼���Ǥ�ä����󥹥ȡ�����̤Υޥ���ǺƸ��Ǥ���"
+"�����������Ȥ��ɤ��ץ���ץȤ��Фơ��ͤ��ѹ��Ǥ��ޤ���\n"
+"\n"
+"�����Ф�����ˤ��ˤϡ��ѡ��ƥ�������ڤ�ȥե����ޥåȤϼ�ư�����ƤϤ�����"
+"���󡣤ɤ�ʥѡ��ƥ�����������ˤ������Ǥ⤽���Ǥ���\n"
+"\n"
+"³���ޤ�����"
+
+#: ../../standalone/drakautoinst_.c:70
+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 "����ǤȤ��������ޤ���"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+"�ե��åԡ�������������ޤ�����\n"
+"����ǥ��󥹥ȡ��뤬�Ƹ��Ǥ��ޤ���"
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "�ץ�󥿤ζ�ͭ��³"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "���󥿡��ͥå���³��ͭ�ϸ���ͭ��"
 
-#: ../../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"
@@ -7083,31 +8089,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
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "�����Ф�̵���ˤ��Ƥ��ޤ��ġ�"
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "���󥿡��ͥå���³��ͭ��̵���ˤʤ�ޤ�����"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "���󥿡��ͥå���³��ͭ�ϸ���̵���Ǥ�"
 
-#: ../../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"
@@ -7119,27 +8125,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 "�����Ф�ͭ���ˤ��Ƥ��ޤ��ġ�"
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "���󥿡��ͥå���³��ͭ��ͭ���Ǥ���"
 
-#: ../../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
 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 "
@@ -7154,21 +8152,21 @@ msgstr ""
 "�����������륨�ꥢ�ͥåȥ�� (LAN) ��Ĥ���ˤϡ����ѤΥͥåȥ�������ץ�"
 "���פ�ޤ���"
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "���󥿡��ե����� %s (�⥸�塼�� %s �����)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
 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."
@@ -7177,6 +8175,10 @@ msgstr ""
 "�Ԥ��Ƥ���������"
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "�ͥåȥ�����󥿡��ե�����"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7191,7 +8193,7 @@ msgstr ""
 "\n"
 "���Υ����ץ��� LAN ����³���ޤ��͡�"
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -7199,22 +8201,23 @@ msgstr ""
 "�������륨�ꥢ�ͥåȥ���ˤĤʤ���ͥåȥ�������ץ���\n"
 "����Ǥ���������"
 
-#: ../../standalone/drakgw_.c:242
+#: ../../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"
-msgstr "���ߤ�$_������Ǥ�LAN���ɥ쥹�����ͤ��뤫�⤷��ޤ���\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "���ߤ� %s ������Ǥ�LAN���ɥ쥹�����ͤ��뤫�⤷��ޤ���\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "�ե������������������򸡽С�"
 
-#: ../../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."
@@ -7222,23 +8225,20 @@ msgstr ""
 "�ٹ𡪴�¸�ե����䥦�����������򸡽С�\n"
 "���󥹥ȡ����ˡ���ư�ǽ������פ뤫�⤷��ޤ���"
 
-#: ../../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 "
@@ -7248,23 +8248,23 @@ msgstr ""
 "����Ǽ�ư�ͥåȥ�������dhcp) ��Ȥäơ�LAN ���¾�Υޥ���ȥ��󥿡��ͥ�"
 "����³��ͭ�Ǥ��ޤ���"
 
-#: ../../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
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "���󥿡��ͥå���³��ͭ�Ϥޤä������ꤵ��Ƥ��ޤ���"
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "���󥿡��ͥå���³������"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7279,84 +8279,82 @@ msgstr ""
 "\n"
 "���ꥦ�������ɤ�ư����ˤϡ�����פ򥯥�å����ޤ��礦��"
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "�ͥåȥ������ (%d �����ץ�)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
-msgstr "�ץ�������: "
+msgstr "�ץ��ե�����: "
 
-#: ../../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:"
-msgstr "�Ϥ�ץ��ե�����̾:"
+#: ../../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 "�ۥ���̾:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "���󥿡��ͥå�"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 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
 msgid "Connected"
 msgstr "��³��λ"
 
-#: ../../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 "��³����Ƥ��ޤ���"
 
-#: ../../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
-#, fuzzy
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
-msgstr "��³��ƥ��Ȥ��Ƥ��ޤ�..."
+msgstr "��³���Ƥ��ޤ�..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "��³���Ĥ��Ƥ��ޤ�..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7367,120 +8365,116 @@ msgstr ""
 "root �ˤʤäơ��ʲ���¹Ԥ��ƤߤƤ���������\n"
 "/etc/sysconfig/network-scripts/net_cnx_down"
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "�����ƥ����³�����Ǥ���ޤ�����"
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "���󥿡��ͥåȥ�������������"
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "LAN������"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "�����ץ�"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "�ɥ饤��"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "���󥿡��ե�����"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "�ץ��ȥ���"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+msgid "State"
+msgstr "����"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "LAN ����ġ�"
 
-#: ../../standalone/draknet_.c:283
-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
 msgid "Please Wait... Applying the configuration"
 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
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "LAN������"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "�����ץ� %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 "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 ""
+"���󥿡��ͥå���³������ޤ���\n"
+"������פ򥯥�å����ƺ������Ƥ�������"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "���󥿡��ͥå���³����"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "���󥿡��ͥå���³����"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "��³�μ���: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "�ѥ�᡼��"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "�ץ��Х����� dns 1 (���ץ����)"
-
-#: ../../standalone/draknet_.c:561
-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 "DHCP ���饤�����"
 
@@ -7549,15 +8543,29 @@ msgstr ""
 "��٥�4 �Υ������ƥ���ǽ�ˤ��ޤ�����������ǥ����ƥ�ϴ����ˤȤ�������\n"
 "�ˤʤäƤ��ޤ����������ƥ��Ϻ���Ǥ���"
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+msgid "Security level"
+msgstr "�������ƥ����"
+
+#: ../../standalone/draksec_.c:67
+msgid "Use libsafe for servers"
+msgstr "�����Ф�libsafe��Ȥ�"
+
+#: ../../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:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "����ȥ����륻�󥿡�"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "���Ѥ���ġ��������ǲ�����"
 
@@ -7585,83 +8593,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "�饤�֥��åץ��졼�ɤ򳫻ϤǤ��ޤ���!!!\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
-msgid "Network Monitoring"
-msgstr "�ͥåȥ���δƻ�"
-
-#: ../../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
-msgid "Close"
-msgstr "�Ĥ���"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "���󥿡��ͥåȤ���³"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "���󥿡��ͥåȤ�������"
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "���󥿡��ͥåȤ�������Ǥ˼���"
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "���󥿡��ͥåȤ�������Ǵ�λ"
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "��³��λ"
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"��³���ԡ�\n"
-"Mandrake ����ȥ����륻�󥿡���������ǧ���Ƥ���������"
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "�����Ѥߡ�"
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "�����Ѥߡ�"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "��³"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "����"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "�ե������������������"
@@ -7692,21 +8631,89 @@ msgstr ""
 "\n"
 "������פ򥯥�å�����ɸ��ե�������������������ꤷ�ޤ�"
 
-#: ../../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 "�����ܡ��ɤ�����"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "�������ƥ�"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "�ե����륷���ƥ�"
+
+#: ../../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 "�����ƥ��Ƴ��"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "�桼������Ͽ"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "�ͥåȥ������"
+
+#: ../../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 ������"
+
+#: ../../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 ""
 "�ߥ˥ե�������������������\n"
 "\n"
-"���� Linux Mandrake �ޥ����ѤθĿ��ѥե�������������������򤷤ޤ���\n"
+"���� Mandrake Linux �ޥ����ѤθĿ��ѥե�������������������򤷤ޤ���\n"
 "���Ϥ����ѥե�������������������ˤϡ����Ѥ� MandrakeSecurity\n"
 "�ե���������������ѥå�������Ƥ���Ƥ���������"
 
-#: ../../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"
@@ -7724,7 +8731,7 @@ msgstr ""
 "�Ǳ����Ƥ��ޤ��ޤ��礦�����Υ��ץꥱ��������¹Ԥ���С������\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"
@@ -7736,7 +8743,7 @@ msgstr ""
 "�����ޤ��礦��\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"
@@ -7748,7 +8755,7 @@ msgstr ""
 "����������\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"
@@ -7762,7 +8769,7 @@ msgstr ""
 "�ѥ���ɤ���ޤ�����������ޤ���ssh�ϰŹ沽����Ƥ���Τǡ�����\n"
 "���ä����İ�����Ǥ��ޤ���"
 
-#: ../../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"
@@ -7773,7 +8780,7 @@ msgstr ""
 "���ä����������Ȥ��ꡢ����ϤȤ�Ǥ�ʤ������ʤ��ȤǤ��������Ǥ�\n"
 "���Фˡ֤������פ������ơ�ssh ��Ȥ��褦�ˤ����ᤷ�ޤ���\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"
@@ -7785,7 +8792,7 @@ msgstr ""
 "FTP ����������ѥ���ɤϡ����٤���İ�Ǥ��ޤ���FTP �ϥѥ����������\n"
 "�Ź��Ȥ�ʤ�����Ǥ���\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"
@@ -7797,7 +8804,7 @@ msgstr ""
 "��ɬ�פǤ�������ʤ���С��ե���������������Ǳ����ޤ��礦��\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"
@@ -7809,7 +8816,7 @@ msgstr ""
 "�ʤ�ɬ�פǤ���\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"
@@ -7820,7 +8827,7 @@ msgstr ""
 "�����䥪�ե����Ǽ�ư������ƤˤʤäƤ���ʤ顢�����\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"
@@ -7834,7 +8841,7 @@ msgstr ""
 "�ȿ��ΰ����ǤϤʤ������פ��碌�ʤ�İ�������Ȥ��ʤ���С�\n"
 "���֤����פǤ�"
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -7846,285 +8853,1564 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "%s �������ޤ���: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "�񤭹����Ѥ� %s �������ޤ���: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "ssh �ʤɳƼ�ץ��ȥ����ѥ��饤�����"
+msgid "Web/FTP"
+msgstr "�����С�Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "��ȯ��"
+msgid "Network Computer (client)"
+msgstr "�ͥåȥ������ԥ塼�� (���饤�����)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "������ơ������"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS ������, SMB ������, Proxy ������, SSH ������"
 
 #: ../../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
-msgid "Network Computer (client)"
-msgstr "�ͥåȥ������ԥ塼�� (���饤�����)"
+msgid "Firewall/Router"
+msgstr "�����С��ե�������������/�롼��"
+
+#: ../../share/compssUsers:999
+msgid "Domain Name and Network Information Server"
+msgstr "�ɥᥤ��̾������ (DNS) �ȥͥåȥ�����󥵡��С�NIS)"
+
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"���ե����ϥ��ե�: ��ץ� (kword, abiword), ɽ�׻� (kspread, gnumeric), pdf"
+"�ӥ塼���ʤ�"
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr "�����ǥ�����Ϣ�ġ��롧mp3, midi, �ߥ������ʤ�"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "���󥿡��ͥåȡ����ơ������"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux ��ե꡼���եȴ�Ϣ���ܤ�ϥ��ġ�ʸ��"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "���ե�����Ϣ"
+msgid "KDE Workstation"
+msgstr "KDE ������ơ������"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "�ޥ����ǥ��������ơ������"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm�ʤ�"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"�᡼���˥塼�����������ѥġ��� (pine, mutt, tin..) �ȡ�Web�֥饦���ѥġ���"
+msgid "Multimedia - Video"
+msgstr "�ޥ����ǥ������ӥǥ�"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C �� C++ ��ȯ�饤�֥�ꡢ�ץ������� include �ե�����"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Database"
+msgstr "�ǡ����١���"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "gnucash�ʤɤβȷ״������ե�"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL �� MySQL �ǡ����١���������"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "Tools to ease the configuration of your computer"
+msgstr "�ޥ���������ڤˤ���ġ���"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS ������, SMB ������, Proxy ������, SSH ������"
+msgid "Multimedia - Sound"
+msgstr "�ޥ����ǥ������������"
+
+#: ../../share/compssUsers:999
+msgid "Utilities"
+msgstr "�桼�ƥ���ƥ�"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "�ɥ�����ơ������"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm�ʤ�"
+msgid "Console Tools"
+msgstr "���󥽡���ġ���"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "�桼�ƥ���ƥ�"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix �᡼�륵����, Inn �˥塼��������"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Internet station"
+msgstr "���󥿡��ͥåȡ����ơ������"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "����ե��å��Ķ�"
+msgid "Multimedia station"
+msgstr "�ޥ����ǥ��������ơ������"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "�ޥ����ǥ������������"
+msgid "Configuration"
+msgstr "����"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "��ڥ��եȡ��ƥ�ӥ����ࡢ�ܡ��ɥ����ࡢ��ά������ʤ�"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "����ե�����ʥǥ����ȥåפ��ä�"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "�ӥǥ��ץ졼����Խ����ե�"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "K �ǥ����ȥå״Ķ�������Ū�ʥ���ե������Ķ��ˡ���Ϣ�ġ���ͤ��碌"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "���󥽡���ġ���"
+msgid "Graphical Environment"
+msgstr "����ե��å��Ķ�"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "������ɤ�ӥǥ��κ����Խ����ե�"
+msgid "Development"
+msgstr "��ȯ��"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "�ʳإ�����ơ������"
+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 "CD ��Ĥ��äƾƤ��ġ���"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux ��ե꡼���եȴ�Ϣ���ܤ�ϥ��ġ�ʸ��"
+msgid "Office Workstation"
+msgstr "���ե���������ơ������"
 
 #: ../../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 �ʤ�"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Graphics programs such as The Gimp"
+msgstr "The Gimp�ʤɤβ����������ե�"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "������"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "�ޥ����ǥ������ӥǥ�"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C �� C++ ��ȯ�饤�֥�ꡢ�ץ������� include �ե�����"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
 msgstr "�ͥåȥ������ԥ塼����������"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "The Gimp�ʤɤβ����������ե�"
+msgid "Mail/Groupware/News"
+msgstr "�����С��᡼��/���롼�ץ�����/�˥塼��"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "���ե���������ơ������"
+msgid "Game station"
+msgstr "�����ॹ�ơ������"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "K �ǥ����ȥå״Ķ�������Ū�ʥ���ե������Ķ��ˡ���Ϣ�ġ���ͤ��碌"
+msgid "Video players and editors"
+msgstr "�ӥǥ��ץ졼����Խ����ե�"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "����ե�����ʥǥ����ȥåפ��ä�"
+msgid "Multimedia - Graphics"
+msgstr "�ޥ����ǥ���������"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "CD ��Ĥ��äƾƤ��ġ���"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "��ڥ��եȡ��ƥ�ӥ����ࡢ�ܡ��ɥ����ࡢ��ά������ʤ�"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "�ޥ����ǥ�����CD ��Ƥ�"
+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
 msgid "Archiving, emulators, monitoring"
 msgstr "���������֥��եȡ����ߥ�졼������˥��ѥ��ե�"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "�ǡ����١���"
+msgid "Personal Finance"
+msgstr "�Ŀͤκ�̳����"
 
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"���ե����ϥ��ե�: ��ץ� (kword, abiword), ɽ�׻� (kspread, gnumeric), pdf"
-"�ӥ塼���ʤ�"
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "�����С�Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Server"
-msgstr "������"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "�Ȥ��䤹�����ץꥱ��������ǥ����ȥåץġ������ġ�����ե������Ķ�"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "�Ŀͤκ�̳����"
+msgid "Clients for different protocols including ssh"
+msgstr "ssh �ʤɳƼ�ץ��ȥ����ѥ��饤�����"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "����"
+msgid "Internet gateway"
+msgstr "���󥿡��ͥåȥ����ȥ�����"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE ������ơ������"
+msgid "Sound and video playing/editing programs"
+msgstr "������ɤ�ӥǥ��κ����Խ����ե�"
 
 #: ../../share/compssUsers:999
 msgid "Other Graphical Desktops"
 msgstr "����¾����ե��å��ǥ����ȥå�"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache �� Pro-ftpd"
+msgid "Editors, shells, file tools, terminals"
+msgstr "���ǥ����������롢�ե������Ϣ�ġ��롢�����ߥʥ�"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "�����С��᡼��/���롼�ץ�����/�˥塼��"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "gnucash�ʤɤβȷ״������ե�"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome ������ơ������"
+msgid "Games"
+msgstr "������"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "���󥿡��ͥå�"
+msgid "Personal Information Management"
+msgstr "�Ŀ;������"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Palm Pilot �� Visor�ѥġ���"
+msgid "Multimedia - CD Burning"
+msgstr "�ޥ����ǥ�����CD ��Ƥ�"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "�����ॹ�ơ������"
+msgid "Scientific Workstation"
+msgstr "�ʳإ�����ơ������"
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm �ʤ�"
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "/etc/sysconfig/autologin ���ɤߤȤ��Ѥ˳����ޤ���: %s"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "�ޥ���������ڤˤ���ġ���"
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "�դĤ��ϡ�/dev/hda�סʥץ饤�ޥ����ͥ�Υޥ������ɥ饤�֡ˤ���\n"
+#~ "��/dev/sda�� (�ǽ�� SCSI �ǥ�����) �����Ӥޤ���\n"
+#~ "������������ˤ���¾���ͤ�����Ƥ���������"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "�ͥåȥ���ǥХ��� %s ��Ƶ�ư���ޤ��������Ǥ��͡�"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "�ͥåȥ����Ƶ�ư���Ƥߤޤ�����"
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "��������Ǥ��͡�"
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "�ͥåȥ���ǥХ�����Ƶ�ư���ޤ���:\n"
+
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "�ʲ��ΰ������塼������ѤߤǤ���\n"
+#~ "�������塼���ɲá��ѹ��Ǥ��ޤ���"
+
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "��³�����ॢ���� (��) [ �١�����̤���� ]"
+
+#~ msgid ""
+#~ "The Mandrake Linux spreads among several CDROMs. It may be that drakX "
+#~ "has\n"
+#~ "selected packages on another CDROM than the installation CDROM, and when "
+#~ "it\n"
+#~ "needs that you put another one into the drive, it will eject the current "
+#~ "CDROM\n"
+#~ "and ask you for another one."
+#~ msgstr ""
+#~ "Mandrake Linux ��ʣ���� CDROM �ˤޤ����äƤ��ޤ����Ǥ����� drakX ��\n"
+#~ "���󥹥ȡ���CDROM�ʳ���CDROM�����ä��ѥå���������������⤷��ޤ���\n"
+#~ "�̤�CDROM��ɬ�פˤʤä��顢���ޤ�CDROM�ϥ��������Ȥ���ơ��̤Τ������\n"
+#~ "����Ⱥ�¥���Ǥޤ���"
+
+#~ msgid ""
+#~ "drakX just skips this test unless you purposely click on the "
+#~ "corresponding step\n"
+#~ "on the left. By default, drakX sees your mouse as a two-button mouse and\n"
+#~ "emulates the third button, and knows whether it's PS/2, serial or USB.\n"
+#~ "\n"
+#~ "Perhaps this is not what you want. In that case, you just have to select "
+#~ "the\n"
+#~ "right type for your mouse in the list which appears.\n"
+#~ "\n"
+#~ "You can now test your mouse. Use buttons and wheel to verify if settings "
+#~ "are\n"
+#~ "good. If not, you can click on \"Cancel\" to choose another driver."
+#~ msgstr ""
+#~ "drakX �ϡ������б����륹�ƥåפ�տ�Ū�˥���å����Ƥ��ʤ��¤ꡢ����\n"
+#~ "�ƥ��Ȥ�ȤФ��ޤ����ǥե���ȤǤ� drakX �ϡ��ޥ�����2�ܥ���ޥ�����\n"
+#~ "��Ƚ�Ǥ�������ܥ���ϥ��ߥ�졼�Ȥ��ޤ��������줬 PS/2, ���ꥢ�롢 USB\n"
+#~ "�Τɤ줫�ϼ�ưȽ�ꤷ�ޤ���\n"
+#~ "\n"
+#~ "�Ǥ⡢����Ϥ��ʤ��Τۤ�������ǤϤʤ����⤷��ޤ��󡣤��ξ��ˤϡ�\n"
+#~ "�ФƤ����������Ŭ�ڤʥޥ����μ��������Ǥ���������\n"
+#~ "\n"
+#~ "�������ޥ�����ƥ��Ȥ��ƤߤƤ����������ܥ����ۥ������Ȥä����꤬\n"
+#~ "����פ���ǧ���ޤ�������ʤ�֥���󥻥�פ�������̤Υɥ饤�Фˤ��ޤ���"
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "%s ��ǥե���ȥץ�󥿤ˤǤ��ޤ���Ǥ�����"
 
-#~ msgid "%d minutes"
-#~ msgstr "���� %d ʬ"
+#~ msgid "Spooler: "
+#~ msgstr "���ס���: "
 
-#~ msgid "1 minute"
-#~ msgstr "���� 1 ʬ"
+#~ msgid "Test the mouse here."
+#~ msgstr "�ޥ�����ƥ��Ȥ��ƤߤƤ���������"
 
-#~ msgid "%d seconds"
-#~ msgstr "���� %d ��"
+#~ msgid "Press next to continue."
+#~ msgstr "�ּ��פ򲡤�����˿ʤߤޤ��礦��"
+
+#~ msgid "/File/_New"
+#~ msgstr "/�ե�����(F)/����(N)"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/�ե�����(F)/����(O)"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/�ե�����(F)/��¸(S)"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/�ե�����(F)/�̤�̾������¸(A)"
+
+#~ msgid "/File/-"
+#~ msgstr "/�ե�����(F)/-"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/���ץ����(O)/�ƥ���"
+
+#~ msgid "/_Help"
+#~ msgstr "/�إ��(H)"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/�إ��(H)/���Υ��եȤˤĤ���(A)"
+
+#~ msgid "Default Runlevel"
+#~ msgstr "�ǥե���ȤΥ���٥�"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "/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 "���ƤΥѡ��ƥ�������ե����ޥåȤ�����,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "�����Υѡ��ƥ��������Υǡ����ϼ����ޤ�"
+
+#~ msgid "Reload"
+#~ msgstr "�������"
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ 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 "��Υꥹ�Ȥ��顢��ʬ�Υ����ܡ������֤�����Ǥ���������"
+
+#~ 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"
+#~ "  - �������ޥ���: GNU/Linux �˾ܤ�����С���ʬ�Υޥ���μ�ʻȤ�����\n"
+#~ "    ���碌�����Ӥޤ��礦���ܤ����ϰʲ��򻲾Ȥ��Ƥ���������\n"
+#~ "\n"
+#~ "\n"
+#~ "  - �������ѡ���: �����������GNU/Linux�˾ܤ����ͤ��������ü��\n"
+#~ "    ���󥹥ȡ���򤷤����������Ӥޤ����֥������ޥ�����\n"
+#~ "    �Υ��󥹥ȡ����Ʊ��������ʬ�Υ����ƥ�λȤ��������٤ޤ���\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 ""
+#~ "�ޥ���λȤ����������ʤ���ϤĤޤꡢ���ʤ������󥹥ȡ���������\n"
+#~ "�֥�������פ��֥������ѡ��ȡפ��������Ȥ��ޤ��ˤϰʲ����̤�:\n"
+#~ "\n"
+#~ "\n"
+#~ "  - ������ơ������: �ޥ�����˥ǥ����ȥåפΰ������ѤǻȤ���\n"
+#~ "    �顢���������Ǥ������������ե�����̳���������Խ��ʤɤǥޥ���\n"
+#~ "    ��Ȥ����ˤϤ���Ǥ�������ѥ���䳫ȯ�ѤΥ桼�ƥ���ƥ�����\n"
+#~ "    ��ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "  - ��ȯ��: ̾���ΤȤ��ꡣ���Υޥ�����˥��եȳ�ȯ�ǻȤ��Τʤ顢\n"
+#~ "    ���������Ǥ��������������������ɤ򥳥�ѥ��롢�ǥХå�������\n"
+#~ "    �����ꡢ���եȥѥå��������ä��ꤹ��Τ˻Ȥ����եȽ������٤�\n"
+#~ "    ���󥹥ȡ��뤵��ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "  - ��������: Mandrake Linux�򥤥󥹥ȡ��뤷�褦�Ȥ��Ƥ���ޥ����\n"
+#~ "    ���������ѤǻȤ��Ĥ��ʤ餳��Ǥ����ե����륵���� (NFS��SMB)��\n"
+#~ "    �ץ�󥿥����С�Unix��lp (�饤��ץ��) �ץ��ȥ��뤫������ɥ���\n"
+#~ "    ����SMB��ͳ�ΰ����ˡ�ǧ�ڥ����� (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"
+#~ "������顢DrakX �Τۤ��ǡ�����򥤥󥹥ȡ��뤹�������;͵�����뤫\n"
+#~ "�����å����ޤ������ʤ�ٹ��Ф��ޤ�������Ǥ�³��������С�DrakX\n"
+#~ "�ϼºݤΥ��󥹥ȡ���˿ʤߤޤ��������פǤʤ��ѥå���������Ȥ��ޤ���\n"
+#~ "�����κǸ�ˡָ��̤Υѥå�����������פȤ����Τ�����ޤ��������\n"
+#~ "���֤ȡ�1000�İʾ�Υѥå������򤺤äȸ��Ƥ������Ȥˤʤ�ޤ���..."
+
+#~ 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"
+#~ "�ѥå������� abc ����¤��ؤ�������С���abc��ȥ��롼�׽��ڤ��ؤ���\n"
+#~ "��������򥯥�å����Ƥ���������\n"
+#~ "\n"
+#~ "\n"
+#~ "��¸�ط��ˤĤ��Ƥηٹ𤬤���ʤ���С��ְ�¸�ط���ư�����פ�\n"
+#~ "����å����Ƥ�����������������֤ȡ�����ѥå�������������\n"
+#~ "�����顢����˰�¸����ѥå���������ޤäƲ������ޤ���"
+
+#~ 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 ""
+#~ "�嵭�ΰ�����CD�����٤Ƥ����äƤ���С�Ok�򥯥�å����ޤ��礦��\n"
+#~ "CD����Ĥ�ʤ���С�����󥻥�򥯥�å����Ƥ���������\n"
+#~ "�긵�ˤʤ�CD������С���������򤫤�Ϥ����Ƥ���Ok�򥯥�å����ޤ���"
+
+#~ 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 ""
+#~ "�Ǥϥޥ�����ƥ��Ȥ��Ƥߤޤ��礦���ܥ����ۥ������ȤäƤߤ�\n"
+#~ "�������꤬��������Ƥ�������������ʤ�֥���󥻥�פ򥯥�å�\n"
+#~ "�����̤Υɥ饤�Ф����Ӥޤ��礦��\n"
+#~ "\n"
+#~ "\n"
+#~ "�⤷���åץ�Υޥ���ǥޥ����ܥ��󤬰�Ĥ����ʤ���С�2���ܤ�3����\n"
+#~ "�Υޥ����ܥ���򥨥ߥ塼�졼�Ȥ��륭�����Ȥ߹�碌������Ǥ��ޤ���\n"
+#~ "����� Linux ���󥽡���Ǥ� X ������ɥ� GUI �Ǥ⡢�ޥ����ε�ǽ��\n"
+#~ "�����˻Ȥ��ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "ADB �ޥ�����ȤäƤ���Ȥ��� USB �����򤷤Ƥ���������Linux �����ͥ�\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 ""
+#~ "�ޥ���򥤥󥿡��ͥåȤ� LAN �ˤĤʤ������ʤ顢�б�����\n"
+#~ "���ץ���������Ǥ������������������ץ������������ˡ����ΥǥХ���\n"
+#~ "���Ÿ��򤤤�ơ�DrakX �˼�ư���Ф����Ƥ���������\n"
+#~ "\n"
+#~ "\n"
+#~ "���󥿡��ͥåȤ� LAN ����³���ʤ��ʤ顢�֥ͥåȥ����Ȥ�ʤ��פ�\n"
+#~ "���Ӥޤ��礦��\n"
+#~ "\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"
+#~ "\n"
+#~ "���ͤޤǤˡ��ǽ�Υ��ꥢ��ݡ��ȡʥ�����ɥ����Ǥϡ�COM1�סˤϡ�\n"
+#~ "Linux �Ǥϡ�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 ""
+#~ "����������륢�åפ�����򤷤ޤ����������Ϥ��Ƥ������狼��ʤ���\n"
+#~ "�ޤ��ϼ������ʤ��Ȥ��ϡ�����������򥤥󥿡��ͥåȤΥץ��Х�����\n"
+#~ "����äƤ���������DNS (�͡��ॵ����) ����򤳤������Ϥ��ʤ���С�\n"
+#~ "���ξ������³���˥��󥿡��ͥåȤΥץ��Х��������������ޤ���"
+
+#~ 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"
+#~ "�狼��ʤ���С�����������򥤥󥿡��ͥåȤΥץ��Х�����ISP) ��\n"
+#~ "����äƤ���������DNS (�͡��ॵ����) ����򤳤������Ϥ��ʤ���С�\n"
+#~ "���ξ������³���˥��󥿡��ͥåȤΥץ��Х��������������ޤ���"
+
+#~ 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"
+#~ "�������Ϥ��Ƥ������狼��ʤ���С�ISP������������򶵤�äƤ���������"
+
+#~ 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 ""
+#~ "����Ǥϥͥåȥ���ǥХ��������ꤷ�ޤ��礦:\n"
+#~ "\n"
+#~ "  - IP ���ɥ쥹: �狼��ʤ���С��ͥåȥ�������Ԥˤ����Ƥ���������\n"
+#~ "    ���ǡּ�ư IP�� ���ץ��������֤ʤ顢���Ϥ��ʤ��Ǥ�������\n"
+#~ "\n"
+#~ "  - �ͥåȥޥ���: ��255.255.255.0�פˤ��Ƥ����Τ�̵��Ǥ����������ʤ���"
+#~ "��\n"
+#~ "�ͥåȥ�������Ԥˤ����Ƥ���������\n"
+#~ "\n"
+#~ "\n"
+#~ "  - ��ư IP: �ͥåȥ���� BOOTP �� DHCP �ץ��ȥ����ȤäƤ�����\n"
+#~ "���Υ��ץ���������Ǥ�����������������֤ȡ���IP ���ɥ쥹�פ����\n"
+#~ "����ɬ�פϤ���ޤ��󡣼������ʤ���С��ͥåȥ�������Ԥˤ�����\n"
+#~ "����������"
+
+#~ 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 ""
+#~ "�Ǥϥ�����륢�åפ�����򤷤ޤ����������Ϥ��Ƥ������狼��ʤ���С�\n"
+#~ "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 ""
+#~ "�ץ�������Ȥ��ʤ顢���������ꤷ�ޤ��礦���ץ�������Ȥ����ɤ���\n"
+#~ "�狼��ʤ���С��ͥåȥ�������Ԥ�ISP�ˤ����Ƥ���������"
+
+#~ 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"
+#~ "��Τˤ��Ƥ���������"
+
+#~ 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 �Υͥåȥ����ͳ�Τ�Ρˤ�"
+#~ "��\n"
+#~ "���ޤ��ޤ���"
+
+#~ 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 ""
+#~ "�����Ǥ���褦�ˤ������ʤ�С�CUPS �� LPR�Τɤ��餫�ΰ��������ƥ��\n"
+#~ "����Ǥ���������\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS �Ͽ����������Ϥǽ���� Unix �Ѱ��������ƥ�Ǥ� (CUPS�Ȥ����Τ�\n"
+#~ "��Common Unix Printing System�פ�ά)��Mandrake Linux�ǤϤ��줬�ǥե����\n"
+#~ "�Ǥ���\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"
+#~ "��⡼�Ȥ� Unix �ޥ���ˤĤʤ��ä��ץ�󥿤򥢥��������������ˤϡ�\n"
+#~ "�֥�⡼�ȥץ�󥿡פ����Ӥޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "��⡼�Ȥ� MS Windows �ޥ���ˤĤʤ��ä��ץ�󥿤򥢥���������ʤ�\n"
+#~ "(���뤤�� SMB �ץ��ȥ����Ȥä� Unix �ޥ���Υץ�󥿡ˡ����֤Τ�\n"
+#~ "��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"
+#~ "     ���ڤ�Ф����ΤǤ����Ǥ����顢��äȰ�̣�Τ���̾���ˤ�������С�\n"
+#~ "     �����ޤ����äƤ��ޤ��礦����My printer|lp�פȤ�����硣\n"
+#~ "     ̾���ˡ�lp�פΤĤ����ץ�󥿤��ǥե���ȤΥץ�󥿤ˤʤ�ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "   * ����: ����Ϥʤ��Ƥ⤤���Ǥ�����ʣ���Υץ�󥿤���äƤ����ꡢ�ۤ�"
+#~ "��\n"
+#~ "     �ޥ��󤬤��Υץ�󥿤˥�����������Ȥ��������Ǥ���\n"
+#~ "\n"
+#~ "\n"
+#~ "   * ���: �⤷�ץ�󥿤ξ��ˤĤ��ƾ�������줿����С�������\n"
+#~ "     ���Ϥ��ޤ��礦�ʡ��󳬡פȤ������ʵ��ҤǤ��ޤ��ޤ���ˡ�\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"
+#~ "\n"
+#~ "\n"
+#~ "   * ���塼��̾��: �ץ�󥿤Υ��ס���ϡ��ǥե���ȤǤϡ�lp�פ�Ȥ���"
+#~ "����\n"
+#~ "     �������lp�פȤ����ץ�󥿤�ɬ�פǤ���\n"
+#~ "     �⤷�ץ�󥿤���������Ǥ⡢̾����ʣ�����������ޤ��������������\n"
+#~ "     �ѥ���ʸ���֡áפǶ��ڤ�Ф����ΤǤ����Ǥ����顢��äȰ�̣�Τ���\n"
+#~ "     ̾���ˤ�������С������ޤ����äƤ��ޤ��礦����My printer|lp�פ�\n"
+#~ "     ������硣\n"
+#~ "     ̾���ˡ�lp�פΤĤ����ץ�󥿤��ǥե���ȤΥץ�󥿤ˤʤ�ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "   * ���ס���ǥ��쥯�ȥ�: ���Υǥ��쥯�ȥ�˰�������֤���¸����ޤ���\n"
+#~ "     ����Ȥ��٤����狼��ʤ���Хǥե���ȤΤޤޤˤ��Ƥ����ޤ��礦\n"
+#~ "\n"
+#~ "\n"
+#~ "   * �ץ����³: �ץ�󥿤��ޥ����ľ�ܤĤʤ��äƤ�����ϡ�\n"
+#~ "     �֥�������ץ�󥿡פ����Ӥޤ�����⡼�Ȥ�Unix�ޥ����Υץ�󥿤�\n"
+#~ "     �Ȥ��ˤϡ��֥�⡼��lpd�ץ�󥿡פ����Ӥޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "     ��⡼�ȤΥ�����ɥ����ޥ���ʤޤ���SMB �ץ��ȥ�����Ѥ�Unix�ޥ���\n"
+#~ "     ��Υץ�󥿤򥢥���������ˤϡ���SMB/Windows 95/98/NT�פ����Ӥ�"
+#~ "����\n"
+#~ "\n"
+#~ "\n"
+#~ "     NetWare �ͥåȥ����Υץ�󥿤򥢥�������������С�\n"
+#~ "     ��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"
+#~ "�����GNU/Linux �Ǥϡ�/dev/lp0�פ�����������ɥ����Ǥϡ�LPT1�פˤʤ�ޤ���"
+
+#~ 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 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 ""
+#~ "�Ǥ�Mandrake Linux�����ƥ��root�ѥ���ɤ����ꤷ�ޤ��礦��\n"
+#~ "�ѥ���ɤ� 2 �����Ϥ��ơ������ץߥ����ʤ����ɤ������ǧ���ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "Root�Ȥ����Τϥ����ƥ�δ����Ԥǡ������ƥ��������Ѥ�����ͣ���\n"
+#~ "��ʪ�Ǥ����Ǥ����顢���Υѥ���ɤ����Ϥ���Ȥ������դ��Ƥ���������\n"
+#~ "root���¤������˻Ȥ��ȡ����Υ����ƥ�䡢�ͥåȥ���ǤĤʤ��ä�¾��\n"
+#~ "�����ƥ�䤽�Υǡ����˽���ʴ�����ڤܤ����Ȥˤʤ꤫�ͤޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "�ѥ���ɤϡ�����ե��٥åȤ�����򺮤�����Τˤ��ơ�����Ǥ� 8 ʸ��\n"
+#~ "ɬ�פǤ���*���Ф�*���äƤ������ꤷ�ƤϤ����ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "�Ǥ�Ĺ���������䤳���������ꤹ��ѥ���ɤ����Ǥ��衣��ʬ�Ǥ�\n"
+#~ "�ڤ˻פ�������ɬ�פ�����ޤ���"
+
+#~ 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 ""
+#~ "�ͥåȥ����ǧ�ڤ� LDAP (�ޤ��� NIS) ��ȤäƤ���ʤ顢ǧ�ڤΤȤ�����\n"
+#~ "\"LDAP\" (�ޤ��� \"NIS\") ������Ǥ����������狼��ʤ���С��ͥåȥ��\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 ""
+#~ "�ǤϤ����ǡ����̾�Ρץ桼����������Ȥ�Ĥ���ޤ���\n"
+#~ "����ϡ��ø��ץ桼����������Ȥ�root �ȤϤ������ޤ������Υ����ƥ��\n"
+#~ "�Ȥ��ͤ����ˡ����줾���̡��Υ�������Ȥ�Ĥ���褦�ˤ��ޤ����ƥ�����\n"
+#~ "��Ȥ��ȼ��δĶ�����ʥ���ե��å��Ķ����ץ����������ʤɡˤ������\n"
+#~ "���줾�켫���Ρ֥ۡ���ǥ��쥯�ȥ�פ���äƤ����ˤ��������������¸\n"
+#~ "���Ƥ����ޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "�ޤ��ϼ�ʬ�ѤΥ�������Ȥ�Ĥ��äƤ������������桼�������ʤ���ͤǤ⡢\n"
+#~ "�դ��󥷥��ƥ��Ȥ��Ȥ��ˤϡ�root��ȤäƤ�*�����ޤ���*\n"
+#~ "�������ȡ��������ƥ���Υꥹ�����������礭���ʤ�ޤ�������ä�\n"
+#~ "���������ץߥ��ǡ������ƥ������������ФƤ��ޤ��衣\n"
+#~ "\n"
+#~ "\n"
+#~ "�������äơ��դĤ��Ϥ����ǤĤ���桼����������Ȥǥ����ƥ��Ȥ��ޤ���\n"
+#~ "����root�ǥ������󤹤�Τϡ������ƥ�����ȥ��ƥʥ󥹤ΤȤ������Ǥ���"
+
+#~ 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"
+#~ "�ʤä��顢���줬�ƥ��󥹥ȡ��뤻���˥ǥ�������ߤ�ͣ��μ��ʤǤ���"
+
+#~ 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 �� grub �μ��ץ��ץ����ϰʲ��ΤȤ���Ǥ�:\n"
+#~ "  - �֡��ȥǥХ���: �֡��ȥ���������ĥǥХ���̾������ʤ��Ȥ��Хϡ���\n"
+#~ "�ǥ������Υѡ��ƥ������ˡ��������ʤ��¤ꡢ��/dev/hda�פ����Ӥޤ��礦��\n"
+#~ "\n"
+#~ "\n"
+#~ "  - �ǥե���ȥ��᡼����ư���Ԥ�����: �֡��ȥ��������ǽ�Υ��᡼����ư\n"
+#~ "����ޤǤ��Ԥ����֤�1/10��ñ�̤ǻ��ꤷ�ޤ�������ϡ������ܡ��ɤ�ͭ����\n"
+#~ "�ʤäƤ����˥ϡ��ɥǥ��������鵯ư���륷���ƥ�ʤɤ������Ǥ�������\n"
+#~ "���Ԥ����֡פ�̵�������ä��ꥼ�����ä��ꤷ���顢�֡��ȥ��������Ԥ��ޤ�"
+#~ "��\n"
+#~ "\n"
+#~ "\n"
+#~ "  - �ӥǥ��⡼�ɡ���ư���˻Ȥ� VGA �ƥ����ȥ⡼�ɤ���ꤷ�ޤ����Ȥ����"
+#~ "��\n"
+#~ "�ʲ����ͤǤ���\n"
+#~ "\n"
+#~ "    * �Ρ��ޥ�: �̾�� 80x25 �Υƥ����ȥ⡼��\n"
+#~ "\n"
+#~ "    * <����>:  �������б������ƥ����ȥ⡼��\n"
+#~ "\n"
+#~ "  - ��ư�Τ��Ӥ� \"/tmp\" �򥯥ꥢ: �����ƥ൯ư���� \"/tmp\" ������ե���"
+#~ "���ǥ��쥯�ȥ��\n"
+#~ "�õ������Ф��Υ��ץ��������Ӥޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "  - ɬ�פ˱����Ƹ�̩�� RAM ����: ��ǰ�ʤ��顢BIOS �˥ޥ����� RAM ��\n"
+#~ "���Τ��̤򤭤���ˡ�����줵��Ƥ��ޤ��󡣤��Τ��� Linux �ϡ�RAM��\n"
+#~ "�̤����Τ˸��ФǤ��ʤ����⤷��ޤ��󡣤��ξ�硢���������Τ� RAM ��\n"
+#~ "�̤򤳤��ǻ���Ǥ��ޤ����ʤ������Ф��줿RAM�ȼºݤ�RAM�� 2-4 MB �ۤ�\n"
+#~ "����Ƥ���ΤϤޤä�������ʤ������ʤ��ȤǤ���"
+
+#~ 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�ѤΥ֡��ȥ������Ǥ�������ԥ塼�����GNU/Linux\n"
+#~ "�ʤɳƼ�OS��ư�Ǥ��ޤ���\n"
+#~ "���̤ϡ�������OS�ϼ�ưŪ�ˤ�����ȸ��Ф���ƥ��󥹥ȡ��뤵��ޤ���\n"
+#~ "���줬����ʤ顢�����Ǽ�ư�ǥ���ȥ���ɲä��ޤ��礦���ѥ�᡼����\n"
+#~ "�ޤ������ʤ��褦���դ��Ƥ���������\n"
+#~ "\n"
+#~ "\n"
+#~ "¾��OS�ˤ�¾�οͤ����������Ǥ��ʤ��褦�ˤ��������Ȥ⤢��ޤ�������\n"
+#~ "���ˤϤ���OS�Υ���ȥ�������Ƥ����ޤ��礦�����������ξ��ϡ�\n"
+#~ "����OS��Ȥ��Ȥ��ˤϵ�ư�ǥ��������פ�ޤ��衪"
+
+#~ 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"
+#~ "  - �֡��ȥ�������Ƴ��: GNU/Linux ��ư����Τ�ɬ�פȤʤ������֤����"
+#~ "��\n"
+#~ "����Ƥ����������ʤˤ򤹤�Ф������Ϥä����ʬ����ʤ����ϡ�\n"
+#~ "�֥ɥ饤�֤κǽ�Υ�����(MBR)�פ����Ӥޤ��礦��\n"
+#~ "\n"
+#~ "\n"
+#~ "  - �ǥե���ȥ��᡼����ư���Ԥ�����: �֡��ȥ��������ǽ�Υ��᡼����ư\n"
+#~ "����ޤǤ��Ԥ����֤�1/10��ñ�̤ǻ��ꤷ�ޤ�������ϡ������ܡ��ɤ�ͭ����\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"
+#~ "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������ɥ������ƥ������򤷤ޤ��礦�������GNU/Linux GUI (����ե���"
+#~ "��\n"
+#~ "�桼�����󥿡��ե������ˤγ˿���ʬ�Ǥ������Τ���ˤϤޤ����ӥǥ������ɤ�\n"
+#~ "��˥�������򤷤ޤ����������桢�ۤȤ�ɤϼ�ư������Ƥ���Τǡ��̾�ʤ�\n"
+#~ "ñ�ˡ���̤򸫤Ƥ��������ǧ��������Ǥ��ߤޤ���\n"
+#~ "\n"
+#~ "\n"
+#~ "���꤬����ä��顢X������������ޤ��ʤ��ʤ�����������ʤ�DrakX��̿�ᤷ��"
+#~ "��\n"
+#~ "�¤�ˡ���������꤬�����������ǧ�Ǥ��ޤ����������ʤ���С���äƤ���\n"
+#~ "���ʤ����ޤ�������ϲ��٤Ǥ⹥���ʤ����Ǥ��ޤ���"
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "X �����꤬����������С����Υ��ץ�����Ȥäơ�X������ɥ������ƥ��\n"
+#~ "���������ꤷľ���Ƥ���������"
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "����ե����롦�������󤬹����ʤ顢�֤Ϥ��פ����Ӥޤ��������Ǥʤ����\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 ""
+#~ "�ޥ���Υ������ƥ��Υ�٥�����٤ޤ����ܤ��������ϥޥ˥奢��򻲾ȡ�\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 ""
+#~ "�����ƥ��Ƶ�ư���ޤ���\n"
+#~ "\n"
+#~ "�Ƶ�ư�����顢������ Mandrake Linux �����ƥब��ưŪ�ˤ���������ޤ���\n"
+#~ "�̤�OS�򤿤����������Ȥ��ˤϡ��ɲä��������ɤ�Ǥ���������"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr "linux��ʣ���Ѥˡ���ư���󥹥ȡ���ǥ�������Ĥ���ޤ�����"
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "�������ʥץ�����ޡ�"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "�����Х����ʥץ�����ޡ�"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL������"
+
+#~ msgid "Europe"
+#~ msgstr "�衼���å�"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remote queue"
+#~ msgstr "��⡼�ȥ��塼"
+
+#~ msgid "Remote queue name missing!"
+#~ msgstr "��⡼�ȥ��塼̾������ޤ���"
+
+#~ msgid ""
+#~ "Here you can specify any arbitrary command line into which the job should "
+#~ "be piped instead of being sent directly to a printer."
+#~ msgstr ""
+#~ "�����Ǥϡ�����֤�ץ�󥿤��������ˡ�Ǥ�դΥ��ޥ�ɤ˥ѥ��פ���褦�����"
+#~ "���ޤ���"
+
+#~ msgid "Command line"
+#~ msgstr "���ޥ�ɥ饤��"
+
+#~ msgid "A command line must be entered!"
+#~ msgstr "���ޥ�ɥ饤������Ϥ��Ƥ���������"
+
+#~ msgid "Option $printer->{ARGS}[$i]{'comment'} must be an integer number!"
+#~ msgstr "Option $printer->{ARGS}[$i]{'comment'} �������ˤ��Ƥ�������!"
+
+#~ msgid "Option $printer->{ARGS}[$i]{'comment'} must be a number!"
+#~ msgstr "Option $printer->{ARGS}[$i]{'comment'} �Ͽ����ˤ��Ƥ�������!"
+
+#~ msgid "Option $printer->{ARGS}[$i]{'comment'} out of range!"
+#~ msgstr "Option $printer->{ARGS}[$i]{'comment'} ���ϰϳ��Ǥ�!"
+
+#~ 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�����Ф�IP���ɥ쥹�ȡ�ɬ�פʤ�\n"
+#~ "�ݡ����ֹ����ꤷ�ޤ��礦��"
+
+#~ msgid "Enter Printer Name and Comments"
+#~ msgstr "�ץ�󥿤�̾���ȥ����Ȥ����Ϥ��Ƥ�������"
+
+#~ msgid "Remove queue"
+#~ msgstr "���塼�κ��"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "����ե���������Ƥ����Ǥ��ޤ���"
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "����ե����뤬�ѤǤ�"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "�Ϥ�ץ��ե�����̾:"
+
+#~ msgid "Adapter"
+#~ msgstr "�����ץ�"
+
+#~ msgid "Disable network"
+#~ msgstr "�ͥåȥ����̵���ˤ���"
+
+#~ msgid "Enable network"
+#~ msgstr "�ͥåȥ����ͭ���ˤ���"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "�ͥåȥ���δƻ�"
+
+#~ msgid "Settings"
+#~ msgstr "����"
+
+#~ msgid "Profile "
+#~ msgstr "�ץ������� "
+
+#~ msgid "Statistics"
+#~ msgstr "����"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "����®�١�"
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "����®�١�"
+
+#~ msgid "Logs"
+#~ msgstr "����"
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "���󥿡��ͥåȤ���³"
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "���󥿡��ͥåȤ�������"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "���󥿡��ͥåȤ�������Ǥ˼���"
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "���󥿡��ͥåȤ�������Ǵ�λ"
+
+#~ msgid "Connection complete."
+#~ msgstr "��³��λ"
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "��³���ԡ�\n"
+#~ "Mandrake ����ȥ����륻�󥿡���������ǧ���Ƥ���������"
+
+#~ msgid "Color configuration"
+#~ msgstr "���顼������"
+
+#~ msgid "sent: "
+#~ msgstr "�����Ѥߡ�"
+
+#~ msgid "received: "
+#~ msgstr "�����Ѥߡ�"
+
+#~ msgid "average"
+#~ msgstr "ʿ��"
+
+#~ msgid "Connect"
+#~ msgstr "��³"
+
+#~ msgid "Disconnect"
+#~ msgstr "����"
+
+#~ 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"
+#~ "�ɥ饤�Ф�����ľ���Ƥ���������"
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (�ޤ��� ADSL) ��³"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "CUPS �ǥץ�󥿤򥢥���������ʤ顢ľ�� URI �����Ǥ��ޤ���"
+
+#~ 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 "�����٥��ץ����"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "�ƥ����Ȥ�PostScript�ǰ������ޤ�����"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "ʸ���Υ��㥮����ʤ����ޤ�����"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "���ϥڡ���������Υڡ�����"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "������;���ݥ���ȿ���1/72������ˤǻ���"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "�岼��;���ݥ���ȿ���1/72������ˤǻ���"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "����¾ GhostScript���ץ����"
+
+#~ msgid "Extra Text options"
+#~ msgstr "����¾�ƥ����ȥ��ץ����"
+
+#~ msgid "Reverse page order"
+#~ msgstr "�Ǹ�Υڡ����������"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS ����"
+
+#~ 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 ""
+#~ "�ץ�󥿤Ϥ��줾��̾�����פ�ޤ��ʤ��Ȥ���lp)��\n"
+#~ "�ۤ��ˤ⡢�ץ�󥿤μ����ޥ���ؤΤĤʤ��꤫���ʤɤΥѥ�᡼����\n"
+#~ "����Ǥ��ޤ������Υץ�󥿤Ϥʤ�Ȥ���̾���ˤ��ޤ����� �����ƥޥ���ȤϤ�"
+#~ "���Ĥʤ��äƤ��ޤ�����"
+
+#~ 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"
+#~ "�Ȥ�̾���ȥǥ��쥯�ȥ�ϲ��ˤ��ޤ�����\n"
+#~ "�ޤ��ץ�󥿤Ϥɤ���³����Ƥ��ޤ�����"
+
+#~ msgid "Name of queue"
+#~ msgstr "���塼��̾����"
+
+#~ msgid "Spool directory"
+#~ msgstr "���ס���Υǥ��쥯�ȥꡧ"
+
+#~ msgid "Disable"
+#~ msgstr "̵����"
+
+#~ msgid "Enable"
+#~ msgstr "ͭ����"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "�⥻�����ƥ������ƥ�ˤ�������С��֥���ɥ��ե������Ȥ��פ�\n"
+#~ "��MD5 �ѥ���ɤ�Ȥ��פ�����Ǥ���������"
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "�⤷�ͥåȥ���� NIS ��ȤäƤ���ʤ��NIS ��Ȥ��פ�����Ǥ���������\n"
+#~ "�狼��ʤ���Хͥåȥ�������Ԥˤ����Ƥ���������"
+
+#~ msgid "yellow pages"
+#~ msgstr "���������ڡ���"
+
+#~ 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 "�ɤΤ褦�ˤ��ƥ��󥿡��ͥåȤ���³���ޤ���?"
 
 #~ msgid "cannot fork: "
 #~ msgstr "�ե������Բ�ǽ��"
@@ -8132,19 +10418,12 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "Configure..."
 #~ msgstr "������..."
 
-#, fuzzy
-#~ msgid "Lilo/Grub configuration"
-#~ msgstr "LAN������"
-
 #~ msgid "Selected size %d%s"
 #~ msgstr "���Ф줿��������%d%s"
 
 #~ msgid "Opening your connection..."
 #~ msgstr "��³�򳫻�..."
 
-#~ msgid "Standard tools"
-#~ msgstr "ɸ��ġ���"
-
 #~ msgid "This startup script try to load your modules for your usb mouse."
 #~ msgstr "���ε�ư������ץȤ�USB�ޥ����ѤΥ⥸�塼�������ɤ��ޤ���"
 
@@ -8284,9 +10563,6 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "Internet/Network access"
 #~ msgstr "���󥿡��ͥå�/�ͥåȥ���ؤΥ�������"
 
-#~ msgid "Mail information"
-#~ msgstr "�᡼��ξ���"
-
 #~ msgid "Firewall Configuration Wizard"
 #~ msgstr "�ե������������������ꥦ��������"
 
@@ -8377,9 +10653,6 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "loopback"
 #~ msgstr "�롼�ץХå�"
 
-#~ msgid "None"
-#~ msgstr "�ʤ�"
-
 #~ msgid "Which bootloader(s) do you want to use?"
 #~ msgstr "�ɤΥ֡��ȥ�������Ȥ��ޤ���"
 
@@ -8401,9 +10674,6 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "Configure local network"
 #~ msgstr "LAN ����"
 
-#~ msgid "Disable networking"
-#~ msgstr "�ͥåȥ����̵���ˤ���"
-
 #~ msgid "Configure the Internet connection / Configure local Network"
 #~ msgstr "���󥿡��ͥå���³���꡿LAN ����"
 
@@ -8454,9 +10724,6 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "Configure timezone"
 #~ msgstr "�����ॾ��������"
 
-#~ msgid "Configure printer"
-#~ msgstr "�ץ�󥿤�����"
-
 #~ msgid "Network adaptater 1 (eth0):"
 #~ msgstr "�ͥåȥ�������ץ� 1��eth0��"
 
@@ -8559,9 +10826,6 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "Update location"
 #~ msgstr "���åץǡ��Ȥ������"
 
-#~ msgid "Remove"
-#~ msgstr "���"
-
 #~ msgid "Find Package"
 #~ msgstr "�ѥå������θ���"
 
@@ -8571,9 +10835,6 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "Toggle between Installed and Available"
 #~ msgstr "���󥹥ȡ���Ѥߤ�̤���󥹥ȡ�����ڤ��ؤ�"
 
-#~ msgid "Uninstall"
-#~ msgstr "���󥤥󥹥ȡ���"
-
 #~ msgid "Choose package to install"
 #~ msgstr "���󥹥ȡ��뤷�����ѥå�����������"
 
@@ -8745,13 +11006,13 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ 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"
@@ -8829,7 +11090,7 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ "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 "
@@ -8878,7 +11139,7 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ "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 "
@@ -8905,13 +11166,13 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgstr ""
 #~ " 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"
@@ -8989,7 +11250,7 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ "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 "
@@ -9038,7 +11299,7 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ "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 "
@@ -9114,7 +11375,7 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ "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"
@@ -9156,7 +11417,7 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 
 #~ 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"
@@ -9199,7 +11460,7 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ "GNU/Linux�ѤΥѡ��ƥ������ν������Ǥ��Ƥ���С����� GNU/Linux \n"
 #~ "�򥤥󥹥ȡ��뤷���ꡢ\n"
 #~ "�̤Υ桼�ƥ���ƥ��ǥѡ��ƥ��������ä����ˡ��ɤΥѡ��ƥ�������\n"
-#~ "Linux-Mandrake�����ƥ�򥤥󥹥ȡ��뤹�뤫�����Ӥޤ��礦��\n"
+#~ "Mandrake Linux�����ƥ�򥤥󥹥ȡ��뤹�뤫�����Ӥޤ��礦��\n"
 #~ "�⤷�ѡ��ƥ��������äƤ��ʤ���С��ϡ��ɥǥ������Υѡ��ƥ�������\n"
 #~ "�����Ǻ��ޤ����ѡ��ƥ������Ȥ����Τϡ�����ԥ塼���Υϡ��ɥǥ�����\n"
 #~ "����Ū�ˤ��碌������Ū�˶��ڤ뤳�ȤǤ���\n"
@@ -9303,7 +11564,7 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ "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"
@@ -9531,9 +11792,6 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "nfs mount failed"
 #~ msgstr "nfs �ޥ���Ȥ˼���"
 
-#~ msgid "CHAP"
-#~ msgstr "CHAP"
-
 #~ 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"
@@ -9647,9 +11905,6 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "Small(%dMB)"
 #~ msgstr "�Ǿ�(%dMB)"
 
-#~ msgid "Modem Configuration"
-#~ msgstr "��ǥ������"
-
 #~ msgid ""
 #~ "Do you want to configure a dialup connection with modem for your system?"
 #~ msgstr "�����ƥ�Υ�ǥ�ˤ��������륢�åץͥåȥ�������ꤷ�ޤ�����"
@@ -9666,9 +11921,6 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "%s: This is not a root partition, please select another one."
 #~ msgstr "%s: ����ϥ롼�ȥѡ��ƥ������ǤϤ���ޤ��󡤤ۤ�������ǲ�������"
 
-#~ msgid "No root partition found"
-#~ msgstr "�롼�ȥѡ��ƥ�����󤬸��Ĥ���ޤ���"
-
 #~ msgid "Please choose a partition to use as your root partition."
 #~ msgstr "�ɤΥѡ��ƥ�������롼�ȥѡ��ƥ������ˤ��ޤ���"
 
@@ -9777,9 +12029,6 @@ msgstr "�᡼�롢�˥塼����web, �ե�����ž��������åȤʤɤΥġ���"
 #~ msgid "useless"
 #~ msgstr "̵��"
 
-#~ msgid "garbage"
-#~ msgstr "����"
-
 #~ 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/lt.po b/perl-install/share/po/lt.po
index e949d8b58..8034d839a 100644
--- a/perl-install/share/po/lt.po
+++ b/perl-install/share/po/lt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX \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-03-04 23:55+0200\n"
 "Last-Translator: Mykolas Norvai�as <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -15,58 +15,58 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\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
 #, fuzzy
 msgid "Use Xinerama extension"
 msgstr "Naudokite automatin� aptikim�"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 #, fuzzy
 msgid "Multi-head configuration"
 msgstr "skaitomi nustatymai"
 
-#: ../../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 "Vaizdo plok�t�"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Pasirink vaizdo plok�t�"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Pasirink X server�"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X serveris"
 
-#: ../../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 "Kuri� XFree konfig�racij� tu nori tur�ti?"
 
-#: ../../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 +75,18 @@ msgstr ""
 "Tavo plok�t� palaiko 3D �renginio akseleracij�, bet tik su XFree %s.\n"
 "Tavo plok�t� dirba su XFree %s, kuris galb�t geriau palaiko 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 "Tavo plok�t� palaiko 3D akseleracij� su 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 su 3D �renginio akseleracija"
 
-#: ../../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 ""
 "J�s� korta palaiko 3D akseleracija su XFree %s.ATMINKITE, KAD TAI YRA "
 "EKSPERIMENTINIS PALIKYMAS IR GALI PAKABINTI KOMPIUTER�."
 
-#: ../../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 su EKSPERIMENTINE 3D �renginio akseleracija"
 
-#: ../../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 ""
 "KOMPIUTER�.\n"
 "J�s� korta dirba su XFree %s kuris galb�t geriau palaiko 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFree konfig�ravimas"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Pasirink savo vaizdo plok�t�s atminties dyd�"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Pasirink serverio nuostatas"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Pasirink monitori�"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "Monitorius"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -152,39 +157,39 @@ msgstr ""
 "u� palaikom� monitoriaus, nes gali j� sugadinti. Jeigu abejoji,\n"
 "pasirink konservatyvi� nuostat�."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Horizontalaus atnaujinimo da�nis"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Vertikalaus atnaujinimo da�nis"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Monitorius nenurodytas"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Vaizdo plok�t� dar nenurodyta"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Dar nepasirinkta skiriamoji geba"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Ar tu nori i�bandyti nustatymus?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Persp�jimas: �ios plok�t�s bandymas gali pakabinti kompiuter�"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Nustatym� tikrinimas"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -192,152 +197,156 @@ msgstr ""
 "\n"
 "pabandyk pakeisti kai kuriuos parametrus"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "�vyko klaida:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Baigiu per %d sekund�i� (-es)"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Ar toks nustatymas tave tenkina?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "�vyko klaida, bandyk pakeisti kai kuriuos parametrus"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Skiriamoji geba"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Pasirink skiriam�j� geb� ir spalv� gyl�"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Vaizdo plok�t�: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 serveris: %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 "Eksperto Re�imas"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Rodyti visk�"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Skiriamosios gebos"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klaviat�ros i�d�stymas: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Pel�s tipas: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Pel�s �renginys: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitorius: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitoriaus horiz. skleistin�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitoriaus vert. skleistin�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Vaizdo plok�t�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Vaizdo plok�t�: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Vaizdo atmintis: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Spalv� gylis: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Skiriamoji geba: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 serveris: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 tvarkykl�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Ruo�iami X-Window nustatymai"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "K� tu nori daryti?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Pakeisti monitori�"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Pakeisti vaizdo plok�t�"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Pakeisti serverio nustatymus"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Pakeisti skiriam�j� geb�"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Rodyti informacij�"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Patikrinti v�l"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "I�eiti"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -350,20 +359,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Pra�om i� naujo paleisti %s, kad pakeitimai b�t� aktyvuoti"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Pra�om atsisveikinti ir paskui paspausti Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X paleid�iant"
 
-#: ../../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,217 +425,228 @@ 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 ar daugiau"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standartinis VGA 640x480 prie 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA 800x600 prie 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "Suderinamas su 8514, 1024x768 prie 87 Hz interlaced (n�ra 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 prie 87 Hz interlaced, 800x600 prie 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 "I�pl�stas Super VGA, 800x600 prie 60 Hz, 640x480 prie 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 prie 60 Hz, 800x600 prie 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Auk�to da�nio SVGA, 1024x768 prie 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Daugiada�nis, galintis 1280x1024 prie 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Daugiada�nis, galintis 1280x1024 prie 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Daugiada�nis, galintis 1280 prie 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitorius, galintis 1600x1200 prie 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitorius, galintis 1600x1200 prie 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 "Pirmasis �krovos skirsnio sektorius"
 
-#: ../../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 "Pirmasis kaupiklio sektorius (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILO �diegimas"
 
-#: ../../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 "Kur nori �diegti �krovos tvarkykl�?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "LILO/GRUB �diegimas"
 
-#: ../../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 su tekstiniu meniu"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO su grafiniu meniu"
 
-#: ../../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 "�krova su 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 "�krovos tvarkykl�s pagrindin�s parinktys"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Naudojama �krovos tvarkykl�"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "�krovos tvarkykl�s �diegimas"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "�krovos �renginys"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nedirba su senais BIOS'ais)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Kompakti�kas"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "kompakti�kas"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Vaizdo re�imas"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Palaukti prie� �kraunant �prast� atvaizd�"
 
-#: ../../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 "Slapta�odis"
 
-#: ../../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 "Slapta�odis (v�l)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Grie�tos komandin�s eilut�s parinktys"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "grie�ta"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "I�valyti /tmp kiekvien� kart� �krovus"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Tikslus RAM atminties dydis (rasta %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Leisti kelet� profili�"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Nurodyk RAM atminties dyd� (MB)"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Parinktis �Grie�tos komandin�s eilut�s parinktys� yra nenauding� be "
 "slapta�od�io"
 
-#: ../../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 "Pra�om bandyti v�l"
 
-#: ../../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 "Slapta�od�iai nesutampa"
 
-#: ../../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 "�prastas"
 
-#: ../../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."
@@ -634,147 +654,146 @@ msgstr ""
 "�ia yra skirtingi �ra�ai.\n"
 "Tu gali pakeisti esamus arba prijungti naujus."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Prid�ti"
 
-#: ../../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 "Atlikta"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 #, fuzzy
 msgid "Modify"
 msgstr "Taisyti RAID"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Kokio tipo �ra�� tu nori prid�ti?"
 
-#: ../../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 "Kitos OS (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Kitos OS (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Kitos OS (Windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Atvaizdas"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "�akninis"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Pridurti"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Skaitymui-ra�ymui"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Lentel�"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Nesaugus"
 
-#: ../../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 "�ym�"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "�prastas"
 
-#: ../../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�mesti �ra��"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Tu��ia �ym� neleid�iama"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "�i �ym� jau naudojama"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Kokio tipo skirsni� skaidymas?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Rasti %s %s interfeisai"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Ar turi dar vien�?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Ar tu turi kok� nors %s interfeis�?"
 
-#: ../../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 "Taip"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Pa�i�r�k �rangos informacij�"
 
 #. -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 "�diegiama tvarkykl� %s plok�tei %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(modulis %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 "Koki� %s tvarkykl� tur��iau i�bandyti?"
 
-#: ../../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 ""
 "parinktis, ar leisi pabandyti nusistatyti pa�iai. Bandymas gali\n"
 "pakabinti kompiuter�, bet tai netur�t� padaryti �alos."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Automatinis bandymas"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Nurodyti parinktis"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Dabar tu gali nurodyti parinktis moduliui %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 ""
 "Opcij� formatas yra toks : ''vardas=reik�m� vardas2=reik�m�2 ...''.\n"
 "Pvz, ''io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Modulio parinktys:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -827,35 +846,35 @@ msgstr ""
 "Modulio %s i�kvietimas nepavyko.\n"
 "Ar nori bandyti su kitais nustatymais?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s jau prid�tas)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "�is slapta�odis pernelyg paprastas"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Pra�om suteikti vartotojo vard�"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Vartotojo vardas turi susidaryti tik i� ma��j� raid�i�, skai�i� ir simboli� "
 "`-' bei `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "�is vartotojo vardas jau prid�tas"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Prid�ti vartotoj�"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -864,49 +883,62 @@ msgstr ""
 "�vesk vartotoj�\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Priimti vartotoj�"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Tikras vardas"
 
-#: ../../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 "Vartotojo vardas"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Automatinis pasisveikinimas"
 
-#: ../../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 ""
 "A� galiu nustatyti taip, kad vienas vartotojas pasisveikint� automati�kai.\n"
 "Jei nenori to naudoti, spausk mygtuk� Nutraukti."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Pasirink �prast� vartotoj�:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Pasirink, kuri� lang� tvarkykl� naudosi:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Pra�om pasirinkti kalb�, kuri� naudosi."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "Tu gali pasirinkti kitas kalbas, kurios bus prieinamos po �diegimo"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Visos"
+
 #. -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"
@@ -922,51 +954,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 "Sveiki, besinaudojantys GRUB, operaciniu sistemu parinkikliu!"
 
 #. -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 "Naudok %c ir %c klavisus, kad pasirinktum, kuris irasas pazymetas"
 
 #. -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 "Spausk enter, noredami ikrauti pasirinkta OS, 'e', noredami keisti"
 
 #. -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 "komandas pries ikrova, arba 'c', komandinei eilutei iskviesti "
 
 #. -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 "Pasirinktas irasas bus ikrautas automatiskai po %d sekundziu."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "nepakanka vietos /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 "Darbastalis"
 
 #. -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 "Paleidimo meniu"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Kur nori �diegti �krovos tvarkykl�?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "pagalba dar nesukurta.\n"
@@ -979,605 +1016,582 @@ msgstr "�diegimo Tipo Konfiguracija"
 msgid "/_File"
 msgstr "/Bylos"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Byla/_Nauja"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Byla/Atidaryti"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Byla/U�ra�yti"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Byla/U�ra�yti Kaip"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Byla/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Byla/I�eiti"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/Pasirinktys"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Pasirinkys/Bandymas"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/Pagalba"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Pagalba/_Apie..."
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-#, fuzzy
-msgid "Configure"
-msgstr "Nustatyti X"
-
-#: ../../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 "Interneto jungties dalinimas"
-
-#: ../../bootlook.pm_.c:121
-#, fuzzy
-msgid "Lilo/grub mode"
-msgstr "Skambinimo re�imas"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr ""
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 #, fuzzy
 msgid "NewStyle Monitor"
 msgstr "Monitorius"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 #, fuzzy
 msgid "Traditional Monitor"
 msgstr "Pakeisti monitori�"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr ""
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "�krovos metu paleisti Aurora"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+#, fuzzy
+msgid "Lilo/grub mode"
+msgstr "Skambinimo re�imas"
+
+#: ../../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 "Interneto jungties dalinimas"
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+#, fuzzy
+msgid "Configure"
+msgstr "Nustatyti X"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "�krovos re�imas"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Sistemos re�imas"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "Startuojant paleisti X_Windows"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Ne, a� nenoriu automatinio pasisveikinimo"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Taip, a� noriu automatinio pasisveikinimo (vrtotojas, darbastalis)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Sistemos re�imas"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "�prastas"
-
-#: ../../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 "Gerai"
 
-#: ../../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 "Nutraukti"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "negaliu atidaryti /etc/inittab skaitymui: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "negaliu atidaryti /etc/sysconfig/autologin skaitymui: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "negaliu atidaryti /etc/inittab skaitymui: %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 �diegimas nepavyko. �vyko tokia klaida:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Sukurti"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Atjungti"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "I�trinti"
-
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatuoti"
+#: ../../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 "Pakeisti dyd�"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "R��is"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minut�s"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Prijungimo vieta"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minut�"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "�ra�yti /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekund�s"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Pakeisti � eksperto re�im�"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Prad�iai padaryk atsargin� savo duomen� kopij�"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Pakeisti � normal� re�im�"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Perskaityk �d�miai!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Atstatyti i� bylos"
+#: ../../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 ""
+"Jeigu tu planuoji naudoti aboot, nepamir�k palikti tu��ios vietos (2048 "
+"sektori� pakanka)\n"
+"kaupiklio prad�ioje"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "I�saugoti � byl�"
+#: ../../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 "Klaida"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Meistras"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Atstatyti i� diskelio"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Naujas"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "I�saugoti � diskel�"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "I�mesti"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "I�valyti visk�"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Prijungimo vieta"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Su�ym�ti visus skirsnius"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Pasirinktys"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Automatinis suskirstymas"
+#: ../../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 "R��is"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "Visi pirminiai skirsniai yra naudojami"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Atjungti"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "A� daugiau negaliu prid�ti n� vieno skirsnio"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Primontuoti"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Pasirink veiksm�"
 
-#: ../../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 ""
-"Jei nori tur�ti daugiau skirsni�, pra�om i�trinti vien�, kad vietoj jo "
-"gal�tum sukurti i�pl�stin�"
+"Tu turi vien� didel� FAT skirsn�\n"
+"(da�niausiai naudojamas Microsoft DOS/Windows).\n"
+"Patariu tau pakeisti to skirsnio dyd�\n"
+"(spragtel�k ant jo, tada ant �Pakeisti dyd�)"
 
-#: ../../diskdrake.pm_.c:61
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Pra�om spragtel�ti ant skirsnio"
+
+#: ../../diskdrake.pm_.c:240
 #, fuzzy
-msgid "Not enough space for auto-allocating"
-msgstr "Naujiems skirsniams nepakanka laisvos vietos"
+msgid "Please click on a media"
+msgstr "Pra�om spragtel�ti ant skirsnio"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Sugr��ti"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Pra�om spragtel�ti ant skirsnio"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "�ra�yti skirsni� lentel�"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Dar"
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detal�s"
 
-#: ../../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 "primontuoti nepavyko"
+
+#: ../../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 "Tu��ias"
 
-#: ../../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 "Kitas"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Byl� sistemos tipai:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detal�s"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Sukurti"
 
-#: ../../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 ""
-"Tu turi vien� didel� FAT skirsn�\n"
-"(da�niausiai naudojamas Microsoft DOS/Windows).\n"
-"Patariu tau pakeisti to skirsnio dyd�\n"
-"(spragtel�k ant jo, tada ant �Pakeisti dyd�)"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Naudok �%s� vietoj to"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Prad�iai padaryk atsargin� savo duomen� kopij�"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "I�trinti"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Perskaityk �d�miai!"
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Pirmiau naudok �Numontuoti�"
 
-#: ../../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 "Pakeitus skirsnio %s tip�, visi duomenys jame bus prarasti"
+
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Kur nori primontuoti �rengin� %s?"
+
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Modulio parinktys:"
+
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"Jeigu tu planuoji naudoti aboot, nepamir�k palikti tu��ios vietos (2048 "
-"sektori� pakanka)\n"
-"kaupiklio prad�ioje"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "B�k atsargus: �i operacija yra pavojinga."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "I�imam� laikmen� automatinis montavimas"
 
-#: ../../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 "Klaida"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Pakeisti skirsnio tip�"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Montavimo ta�kas: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Kokios byl� sistemos tu nori?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "�renginys: "
+#: ../../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 kaupiklio raid�: %s (sp�jama)\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 "Tipas: "
+#: ../../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 "Pavadinimas: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+#, fuzzy
+msgid "Server"
+msgstr "serveris"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Prad�ia: sektorius %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Dydis: %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 sektoriai(-i�)"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Nuo cilindro %d iki cilindro %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Pasirink veiksm�"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Su�ym�tas\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Sukurti nauj� skirsn�"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Nesu�ym�tas\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Primontuotas\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Pakeisti � eksperto re�im�"
 
-#: ../../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 "Pakeisti � normal� re�im�"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback byla(os): %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Sugr��ti"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Skirsnis, �kraunamas pagal nutyl�jim�\n"
-"     (MS-DOS u�krovimui, ne LILO)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Ar vis tiek t�sti?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Lygis %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "I�eiti nei�saugojus"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Gabalo dydis %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "I�eiti nei�saugojus skirsni� lentel�s?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID kaupikliai %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Ar tu nori i�bandyti nustatymus?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Loopback bylos vardas: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Automatinis suskirstymas"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "I�valyti visk�"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Dar"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Pa�to informacij�"
+
+#: ../../diskdrake_interactive.pm_.c:267
+#, fuzzy
+msgid "Not enough space for auto-allocating"
+msgstr "Naujiems skirsniams nepakanka laisvos vietos"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Visi pirminiai skirsniai yra naudojami"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "A� daugiau negaliu prid�ti n� vieno skirsnio"
 
-#: ../../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 ""
-"\n"
-"Galimyb�s tokios, �is skirsnis\n"
-"yra Tvarkykl�s skirsnis\n"
-"gariau palikite j� ramyb�je.\n"
+"Jei nori tur�ti daugiau skirsni�, pra�om i�trinti vien�, kad vietoj jo "
+"gal�tum sukurti i�pl�stin�"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "�ra�yti skirsni� lentel�"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "I�gelb�ti skirsni� lentel�"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "I�gelb�ti skirsni� lentel�"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "I�gelb�ti skirsni� lentel�"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "I�imam� laikmen� automatinis montavimas"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Pasirink byl�"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../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"
-"�is specialus Bootstrap\n"
-"skirsnis yra skirtas j�s�\n"
-"sistemos dvigubai �krovai.\n"
+"Atsargin� skirsni� lentel� n�ra tokio paties dyd�io\n"
+"Vis tiek t�sti?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Pra�om spragtel�ti ant skirsnio"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "D�mesio"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Dydis: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"�d�k diskel� � kaupikl�\n"
+"Visi duomenys diskelyje bus prarasti"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometrija: %s cilindr�(-ai), %s galvu�i�(-os), %s sektori�(-iai)\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Bandau i�gelb�ti skirsni� lentel�"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM kaupikliai %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Pa�to informacij�"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Skirsni� lentel�s tipas: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Pakeisti dyd�"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "ant magistral�s %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Perkelti"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Primontuoti"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatuoti"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Aktyvus"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Prid�ti � RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Pa�alinti i� RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Taisyti RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Prid�ti � LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Pa�alinti i� RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Pa�alinti i� LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Taisyti RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Naudoti loopback'ui"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Pasirink veiksm�"
-
-#: ../../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 ""
-"Deja, ne�manoma sukurti /boot taip toli kaupiklyje (cilindre >1024).\n"
-"Arba naudok LILO ir tai neveiks, arba nenaudok LILO ir tau nereik�s /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 ""
-"Skirsnis, kur� tu pasirinkai kaip �aknin� (/), fizi�kai yra u� 1024-to\n"
-"disko kaupiklio cilindro, bet tu neturi /boot skirsnio. Jeigu planuoji\n"
-"naudoti LILO �krovos program�, neu�mir�k prid�ti /boot skirsnio"
-
-#: ../../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 ""
-"Tu pasirinkai programin� RAID skirsn� kaip �aknin� (/).\n"
-"Jokia �krovos tvarkykl� negali su ja dirbti be /boot skirsnio.\n"
-"Taigi, nepamir�k sukurti /boot skirsnio"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Sukurti nauj� skirsn�"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Naudok �%s� vietoj to"
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Prad�ios sektorius: "
 
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Pirmiau naudok �Numontuoti�"
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Dydis (MB): "
 
-#: ../../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 "Pakeitus skirsnio %s tip�, visi duomenys jame bus prarasti"
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Byl� sistemos tipas: "
 
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Ar vis tiek t�sti?"
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Montavimo ta�kas: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "I�eiti nei�saugojus"
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Pirmenyb�: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "I�eiti nei�saugojus skirsni� lentel�s?"
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Su�ymima loopback byla %s"
 
-#: ../../diskdrake.pm_.c:516
+#: ../../diskdrake_interactive.pm_.c:486
 msgid "Change partition type"
 msgstr "Pakeisti skirsnio tip�"
 
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Kokios byl� sistemos tu nori?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Tu negali naudoti ReiserFS skirsniams, ma�esniems nei 32MB"
+#: ../../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 "Kur nori primontuoti loopback byl� %s?"
 
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Kur nori primontuoti �rengin� %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"
@@ -1585,221 +1599,383 @@ msgstr ""
 "Negaliu nuimti montavimo ta�ko, nes �is skirsnis naudojamas loopback'ui.\n"
 "Pirma pa�alink loopback'us"
 
-#: ../../diskdrake.pm_.c:561
-#, c-format
-msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "Su�ym�jus skirsn� %s, visi duomenys jame bus prarasti"
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Skai�iuojami FAT byl� sistemos r��iai"
 
-#: ../../diskdrake.pm_.c:563
-msgid "Formatting"
-msgstr "Su�ymima"
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Kei�iamas dydis"
 
-#: ../../diskdrake.pm_.c:564
-#, c-format
-msgid "Formatting loopback file %s"
-msgstr "Su�ymima loopback byla %s"
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "�io skirsnio dyd�io neina pakeisti"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Su�ymimas skirsnis %s"
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Pasidaryk atsargin� duomen� �iame skirsnyje kopij�"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Su�ym�jus visus skirsnius,"
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr "Pakeitus skirsnio %s dyd�, visi duomenys jame bus prarasti"
 
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "visi duomenys, esantys �iuose skirsniuose, bus prarasti"
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Pasirink nauj� dyd�"
 
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Perkelti"
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Dydis (MB): "
 
-#: ../../diskdrake.pm_.c:577
+#: ../../diskdrake_interactive.pm_.c:631
 msgid "Which disk do you want to move it to?"
 msgstr "� kur� disk� tu nori j� perkelti?"
 
-#: ../../diskdrake.pm_.c:578
+#: ../../diskdrake_interactive.pm_.c:632
 msgid "Sector"
 msgstr "Sektorius"
 
-#: ../../diskdrake.pm_.c:579
+#: ../../diskdrake_interactive.pm_.c:633
 msgid "Which sector do you want to move it to?"
 msgstr "� kur� sektori� tu nori j� perkelti?"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving"
 msgstr "Perkeliama"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving partition..."
 msgstr "Perkeliamas skirsnis..."
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Pasirink jau esant� RAID, prie kurio prid�ti"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "naujas"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Pasirink jau esant� LVM, prie kurio prid�ti"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM vardas?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "�is skirsnis negali b�ti naudojamas loopback'ui"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Loopback bylos vardas: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Tikras vardas"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "Byla jau naudojama kitam loopback'ui, pasirink kit�"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "�i byla jau yra. Naudoti j�?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "�renginys"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "lygis"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "gabalo dydis"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "B�k atsargus: �i operacija yra pavojinga."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Kokio tipo skirsni� skaidymas?"
+
+#: ../../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 ""
+"Deja, ne�manoma sukurti /boot taip toli kaupiklyje (cilindre >1024).\n"
+"Arba naudok LILO ir tai neveiks, arba nenaudok LILO ir tau nereik�s /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 ""
+"Skirsnis, kur� tu pasirinkai kaip �aknin� (/), fizi�kai yra u� 1024-to\n"
+"disko kaupiklio cilindro, bet tu neturi /boot skirsnio. Jeigu planuoji\n"
+"naudoti LILO �krovos program�, neu�mir�k prid�ti /boot skirsnio"
+
+#: ../../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 ""
+"Tu pasirinkai programin� RAID skirsn� kaip �aknin� (/).\n"
+"Jokia �krovos tvarkykl� negali su ja dirbti be /boot skirsnio.\n"
+"Taigi, nepamir�k sukurti /boot skirsnio"
+
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "�renginio %s skirsni� lentel� bus �ra�yta � disk�!"
 
-#: ../../diskdrake.pm_.c:594
+#: ../../diskdrake_interactive.pm_.c:868
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Tau reikia perkrauti, kad pakeitimai b�t� veiksmingi"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Skai�iuojami FAT byl� sistemos r��iai"
+#: ../../diskdrake_interactive.pm_.c:879
+#, c-format
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr "Su�ym�jus skirsn� %s, visi duomenys jame bus prarasti"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Kei�iamas dydis"
+#: ../../diskdrake_interactive.pm_.c:881
+msgid "Formatting"
+msgstr "Su�ymima"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "�io skirsnio dyd�io neina pakeisti"
+#: ../../diskdrake_interactive.pm_.c:882
+#, c-format
+msgid "Formatting loopback file %s"
+msgstr "Su�ymima loopback byla %s"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Pasidaryk atsargin� duomen� �iame skirsnyje kopij�"
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Su�ymimas skirsnis %s"
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid nepavyko"
+
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Naujiems skirsniams nepakanka laisvos vietos"
+
+#: ../../diskdrake_interactive.pm_.c:895
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "Pakeitus skirsnio %s dyd�, visi duomenys jame bus prarasti"
+msgid ""
+"Directory %s already contain some data\n"
+"(%s)"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Pasirink nauj� dyd�"
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Naujiems skirsniams nepakanka laisvos vietos"
 
-#: ../../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 "Sukurti nauj� skirsn�"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Skiriamoji geba: %s\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Prad�ios sektorius: "
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "�renginys: "
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Dydis (MB): "
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS kaupiklio raid�: %s (sp�jama)\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Byl� sistemos tipas: "
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Tipas: "
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Pirmenyb�: "
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Pavadinimas: "
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "�is skirsnis negali b�ti naudojamas loopback'ui"
+#: ../../diskdrake_interactive.pm_.c:954
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "Prad�ia: sektorius %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Loopback"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Dydis: %s"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Loopback bylos vardas: "
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektoriai(-i�)"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "Byla jau naudojama kitam loopback'ui, pasirink kit�"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Nuo cilindro %d iki cilindro %d\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "�i byla jau yra. Naudoti j�?"
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Su�ym�tas\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Pasirink byl�"
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Nesu�ym�tas\n"
 
-#: ../../diskdrake.pm_.c:876
-msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
-msgstr ""
-"Atsargin� skirsni� lentel� n�ra tokio paties dyd�io\n"
-"Vis tiek t�sti?"
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Primontuotas\n"
 
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "D�mesio"
+#: ../../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 "Loopback byla(os): %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
-"�d�k diskel� � kaupikl�\n"
-"Visi duomenys diskelyje bus prarasti"
+"Skirsnis, �kraunamas pagal nutyl�jim�\n"
+"     (MS-DOS u�krovimui, ne LILO)\n"
 
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Bandau i�gelb�ti skirsni� lentel�"
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Lygis %s\n"
 
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "�renginys"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Gabalo dydis %s\n"
 
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "lygis"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID kaupikliai %s\n"
 
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "gabalo dydis"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Loopback bylos vardas: %s"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Pasirink jau esant� RAID, prie kurio prid�ti"
+#: ../../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"
+"Galimyb�s tokios, �is skirsnis\n"
+"yra Tvarkykl�s skirsnis\n"
+"gariau palikite j� ramyb�je.\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "naujas"
+#: ../../diskdrake_interactive.pm_.c:978
+msgid ""
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
+msgstr ""
+"\n"
+"�is specialus Bootstrap\n"
+"skirsnis yra skirtas j�s�\n"
+"sistemos dvigubai �krovai.\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Pasirink jau esant� LVM, prie kurio prid�ti"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Dydis: %s\n"
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "LVM vardas?"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometrija: %s cilindr�(-ai), %s galvu�i�(-os), %s sektori�(-iai)\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "I�imam� laikmen� automatinis montavimas"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info: "
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "I�gelb�ti skirsni� lentel�"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM kaupikliai %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Skirsni� lentel�s tipas: %s\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "V�l �kelti"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "ant magistral�s %d id %d\n"
+
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Pasirinktys: %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 su�ym�jimas nepavyko"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Ne�inau, kaip su�ym�ti %s tipu %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "primontuoti nepavyko"
+
+#: ../../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 "primontuoti nepavyko: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "klaida numontuojant %s: %s"
@@ -1812,40 +1988,43 @@ msgstr "paprasta"
 msgid "server"
 msgstr "serveris"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Tu negali naudoti JFS skirsniams, ma�esniems nei 16MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Tu negali naudoti ReiserFS skirsniams, ma�esniems nei 32MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Montavimo ta�kai turi prasid�ti /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Jau yra skirsnis su montavimo ta�ku %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Loopback montavimai %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 "�is katalogas turi pasilikti �aknin�je byl� sistemoje"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Tau reikia tikros byl� sistemos (ext2, reiserfs) �iam montavimo ta�kui\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Klaida atidarant %s �ra�ymui: %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"
@@ -1853,332 +2032,409 @@ msgstr ""
 "�vyko klaida -- nerasta tinkam� �rengini�, kur b�t� galima sukurti naujus "
 "skirsnius. Pra�om pasitikrinti savo �rang� d�l galimo gedimo"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Tu neturi joki� skirsni�!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "Pasirink norim� kalb� �diegimui ir sistemos vartojimui"
-
-#: ../../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 ""
-"Tu turi sutikti su auk��iau esan�ios licenzijos s�lygomis, kad t�stum "
-"�diegim�.\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"
-"Pra�om spausti �Sutinku�, jei sutinki su jos s�lygomis.\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"
-"Pra�om spausti �Atmetu�, jei nesutinki su jos s�lygomis.\n"
-"�diegimas bus nutrauktas, nekei�iant esamos konfig�racijos."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Pasirink norim� klaviat�ros i�d�stym� i� s�ra�o auk��iau"
-
-#: ../../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 ""
-"Jei nori, kad kitos kalbos (be tos, kuri� nurodei �diegimo prad�ioje)\n"
-"b�t� prieinamos �diegus sistem�, pasirink jas i� auk��iau esan�io\n"
-"s�ra�o. Jei nori vis�, tiesiog spausk �Visos�."
-
-#: ../../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"
+"Auk��iau yra s�ra�as Linux skirsni�, kuriuos pavyko rasti tavo\n"
+"kietajame diske. Tu gali pasilikti sprendimus, padarytus meistro, jie tinka\n"
+"daugumai atvej�. Jei nori pakeisti �iuos sprendimus, tu turi nurodyti bent\n"
+"�aknin� skirsn� (\"/\"). Nepasirink per ma�o skirsnio, nes tuomet tu "
+"negal�si\n"
+"�diegti pakankamai programin�s �rangos. Jei tu nori laikyti savo duomenis\n"
+"atskirame skirsnyje, pasirink, kur� naudosi \"/home\" (�manoma tik jei turi "
+"daugiau\n"
+"nei vien� Linux skirsn�).\n"
 "\n"
+"Tavo �iniai, skirsniai ra�omi tokiu pavidalu: \"Pavadinimas\", \"Talpa\".\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
 "\n"
+"\"Pavadinimas\" sudaromas taip: \"kaupiklio tipas\", \"kaupiklio numeris\",\n"
+"\"skirsnio numeris\" (pavyzd�iui \"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"
+"\"Kieto disko tipas\" yra \"hd\", jei tavo kietasis kaupiklis yra IDE tipo, "
+"ir \"sd\", jeigu\n"
+"tai SCSI kaupiklis.\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"
+"\"kaupiklio numeris\" visada yra raid� po \"sd\" arba \"hd\". IDE "
+"kaupikliams:\n"
 "\n"
+"   * \"a\" rei�kia \"pagrindinis (master) diskas, prijungtas prie pirmojo "
+"(primary) IDE valdiklio\",\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 ""
-"Pra�om pasirinkti ��diegti�, jei � sistem� n�ra �diegta ankstesni� Linux-"
-"Mandrake versij�,\n"
-"arba jei nori naudoti kelias operacij� sistemas.\n"
+"   * \"b\" rei�kia \"�alutinis (slave) diskas, prijungtas prie pirmojo IDE "
+"valdiklio\",\n"
 "\n"
-"Pra�om pasirinkti �Atnaujinti�, jei nori atnaujinti jau �diegt� Linux-"
-"Mandrake versij�.\n"
+"   * \"c\" rei�kia \"pagrindinis diskas, prijungtas prie antrojo (secondary) "
+"IDE valdiklio\",\n"
 "\n"
+"   * \"d\" rei�kia \"�alutinis diskas, prijungtas prie antrojo IDE valdiklio"
+"\",\n"
 "\n"
-"Priklausomai nuo tavo �ini� apie GNU/Linux, tu gali pasirinkti �ias klases "
-"�diegti ar atnaujinti \n"
-"Linux-Mandrake operacij� sistem�:\n"
 "\n"
-"\t* Rekomenduojama: jei niekad nesi �dieg�s GNU/Linux operacij� sistemos, "
-"pasirink �i�. �diegimas bus labai\n"
-"\t  lengvas, tav�s bus paklausta tik keletas klausim�.\n"
+"Su SCSI kaupikliais, \"a\" rei�kia \"pirmasis diskas\", \"b\" rei�kia "
+"\"antrasis diskas\" ir t.t."
+
+#: ../../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* Prisitaikyta: jei esi pakankamai susipa�in�s su GNU/Linux, tu gali "
-"pasirinkti pagrindin� sistemos paskirt�\n"
-"\t(darbo stotis, serveris, k�rimo). Tu tur�si atsakyti � daugiau klausim�, "
-"nei �Rekomenduojamoje� �diegimo\n"
-"\tklas�je, taigi turi �inoti, kaip veikia GNU/Linux, kad pasirinktum �i� "
-"klas�.\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* Eksperto: jei gerai i�manai GNU/Linux, gali pasirinkti �i� �diegimo "
-"klas�. kaip ir �Prisitaikytoje� klas�je,\n"
-"\t  tu gal�si pasirinkti pagrindin� sistemos paskirt�\t(darbo stotis, "
-"serveris, k�rimo). B�k labai atsargus, prie� \n"
-"\t  pasirinkdamas �i� �diegimo klas�. Tu gal�si atlikti smarkiai "
-"prisitaikyt� �diegim�.\n"
-"\t  Atsakyti � kai kuriuos klausimus gali b�ti itin sud�tinga, jei gerai "
-"nei�manai GNU/Linux. Taigi, nesirink �ios\n"
-"\t  �diegimo klas�s, nebent tikrai �inai, k� darai."
-
-#: ../../help.pm_.c:56
-msgid ""
-"Select:\n"
+" * \"Development\": if the machine is to be used for programming, choose "
+"the\n"
+"desired group(s).\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"
+" * \"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"
-"  - 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 ""
-"Pasirink:\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group.\n"
 "\n"
-"  - Prisitaikyta: Jeigu esi pakankamai pa��stamas su GNU/Linux, gal�si "
-"pasirinkti pagrindin� sistemos paskirt�. �i�r�k �emiau d�l smulkmen�.\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"
-"\n"
-"  - Eksperto: Jeigu tau puikiai sekasi su GNU/Linux, ir nori smarkiai "
-"prisitaikyti \n"
-"    �diegim�. Kaip ir �Prisitaikytoje� klas�je, tu gal�si pasirinkti "
-"pagrindin� \n"
-"    sistemos paskirt�. Bet, labai pra�au, NESIRINK �ITO, NEBENT TIKRAI "
-"�INAI, K� DARAI!"
+"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 ""
-"Tu turi apibr��ti, kam ma�ina bus naudojama. Pasirinkimai yra:\n"
-"\n"
-"\t* Darbo stotis: tai geriausias pasirinkimas, jei ruo�iesi ma�in� naudoti "
-"daugiausiai kasdieniams darbams,\n"
-"\t  �staigoje ar namie.\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* K�rimo: jei ruo�iesi �i� ma�in� naudoti daugiausiai programin�s �rangos "
-"k�rimui, tai geras pasirinkimas. Tu\n"
-"\t  tada tur�si �diegt� piln� rinkin� program�, skirt� kompiliuoti, derinti "
-"ir formatuoti i�eities tekstus, bei kurti\n"
-"\t  program� paketus.\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* Serveris: jei ruo�iesi naudoti �i� ma�in� naudoti kaip server�, tai "
-"geras pasirinkimas. Tiek byl� server�\n"
-"\t  (NFS arba SMB), tiek spausdinimo server� (Unix ar Microsoft Windows "
-"stiliaus), autentikacijos (NIS),\n"
-"\t  duomen� baz�s server� ir pan. Jei taip, nesitik�k, kad bus �diegti "
-"visokie gra�umai (KDE, 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"
+"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"
-"\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 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 bandys surasti PCI SCSI adapter�(-ius). Jei DrakX\n"
-"ras SCSI adapter� ir �inos, koki� tvarkykl� naudoti, ji bus automati�kai\n"
-"�diegta.\n"
+"Dabar tu gali pasirinkti tarnybas, kurias nori paleisti �krovos metu.\n"
 "\n"
 "\n"
-"Jei tu neturi SCSI adapterio, turi ISA SCSI adapter� ar PCI SCSI adapter�,\n"
-"kurio DrakX nepa��sta, tav�s bus paklausta, ar sistemoje yra SCSI\n"
-"adapteris. Jei n�ra n� vieno, gali spausti �Ne�. Jei paspausi �Taip�, bus\n"
-"parodytas tvarkykli� s�ra�as, i� kurio gal�si pasirinkti tinkam� savo\n"
-"adapteriui.\n"
+"U�vedus �ymekl� ant tarnybos, pasirodys pagalbos u�ra�as, kuris apra�o "
+"tarnybos\n"
+"vaidmen� tavo sistemoje.\n"
 "\n"
 "\n"
-"Jei tau teks rankomis nurodyti savo adapter�, DrakX papra�ys tav�s\n"
-"nurodyti jo nuostatas. Tu tur�tum leisti DrakX bandyti atpa�inti �rangos\n"
-"nuostatas. Da�niausiai tai suveikia.\n"
+"B�k ypa� atidus �iame �ingsnyje, jeigu �adi naudotis savo kompiuteriu kaip\n"
+"serveriu: tu tikriausiai nor�si nepaleisti joki� nereikaling� tarnyb�.\n"
+"Prisimink, kad kai kurios tarnybos gali b�ti pavojingos, jei naudojamos "
+"serveryje.\n"
+"Apskritai, pa�ym�k tik tas tarnybas, kuri� tau tikrai reikia."
+
+#: ../../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 tvarko laik� pagal GMT (Greenwich Mean Time),\n"
+"ir paver�ia j� � vietin� laik� pagal tavo pasirinkt� laiko juost�."
+
+#: ../../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"
-"Jei ne, tau teks nurodyti tvarkykl�s nuostatas. Pra�om per�i�r�ti User "
-"Guide\n"
-"(chapter 3, section \"Collective informations on your hardware) d�l "
-"patarim�,\n"
-"kaip su�inoti informacij� apie �rangos dokumentacij�, i� gamintojo "
-"svetain�s\n"
-"tinkle (jei turi pri�jim� prie interneto) arba i� Microsoft Windows (jei "
-"turi juos\n"
-"savo sistemoje)."
+"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 ""
 "Dabar tu turi nuspr�sti, kurioje savo kietojo disko vietoje nori �diegti\n"
-"Linux-Mandrake operacij� sistem�. Jei jis yra tu��ias arba jau esanti\n"
+"Mandrake Linux operacij� sistem�. Jei jis yra tu��ias arba jau esanti\n"
 "operacij� sistema naudoja vis� viet� jame, tau reik�s sudalinti j�. Kietojo\n"
 "disko sudalinimas � skirsnius tiesiog yra jo logi�kas padalinimas taip, kad\n"
-"atsirast� laisvos vietos �diegti tavo naujajai Linux-Mandrake sistemai.\n"
+"atsirast� laisvos vietos �diegti tavo naujajai Mandrake Linux sistemai.\n"
 "\n"
 "\n"
 "Kadangi sudalinimo skirsniais padariniai da�niausiai yra negr��tami,\n"
@@ -2202,128 +2458,233 @@ msgstr ""
 "naudokis auk��iau esan�iu meistru. Priklausomai nuo tavo kietojo disko\n"
 "situacijos, yra keli skirtingi sprendimai:\n"
 "\n"
-"\t* Naudoti esam� skirsn�: meistras rado vien� ar daugiau Linux skirsni� "
-"tavo sistemoje. Jei tu nori juos\n"
-"\t  naudoti, pasirink tai.\n"
+"* Naudoti esam� skirsn�: meistras rado vien� ar daugiau Linux skirsni� tavo "
+"sistemoje. Jei tu nori juos\n"
+"  naudoti, pasirink tai.\n"
 "\n"
 "\n"
-"\t* I�valyti vis� disk�: jei tu nori sunaikinti visus duomenis ir skirsnius, "
+"* I�valyti vis� disk�: jei tu nori sunaikinti visus duomenis ir skirsnius, "
 "esan�ius kietajame diske, ir pakeisti juos\n"
-"\t  nauja Linux-Mandrake sistema, gali pasirinkti �� variant�. B�k atsargus "
-"su �iuo sprendimu, nes jei sutiksi,\n"
-"\t  nebegal�si apsigalvoti ir sugr��ti.\n"
+"  nauja Mandrake Linux sistema, gali pasirinkti �� variant�. B�k atsargus su "
+"�iuo sprendimu, nes jei sutiksi,\n"
+"  nebegal�si apsigalvoti ir sugr��ti.\n"
 "\n"
 "\n"
-"\t* Naudoti tu��i� viet� Windows skirsnyje: jei Microsoft Windows yra "
-"�diegti � kiet�j� disk� ir u�ima vis� viet�,\n"
-"\t  esan�i� jame, tau teks atlaisvinti vietos Linux duomenims. Kad tai "
+"* Naudoti tu��i� viet� Windows skirsnyje: jei Microsoft Windows yra �diegti "
+"� kiet�j� disk� ir u�ima vis� viet�,\n"
+"  esan�i� jame, tau teks atlaisvinti vietos Linux duomenims. Kad tai "
 "padarytum, tu gali i�trinti Windows skirsn�\n"
-"\t  ir duomenis (�i�r�k \"I�valyti vis� disk�\" bei \"Eksperto re�imas\" "
+"  ir duomenis (�i�r�k \"I�valyti vis� disk�\" bei \"Eksperto re�imas\" "
 "sprendimus) arba pakeisti Windows skirsnio\n"
-"\t  dyd�. Dyd�io pakeitimas gali b�ti atliktas be duomen� praradimo. �is "
+"  dyd�. Dyd�io pakeitimas gali b�ti atliktas be duomen� praradimo. �is "
 "sprendimas yra rekomenduojamas, jei\n"
-"\t  tu nori naudoti tiek Linux-Mandrake, tiek Microsoft Windows tame pa�iame "
+"  tu nori naudoti tiek Mandrake Linux, tiek Microsoft Windows tame pa�iame "
 "kompiuteryje.\n"
 "\n"
 "\n"
-"\t  Prie� pasirinkdamas �� sprendim�, suprask, kad Microsoft Windows "
-"skirsnio dydis bus ma�esnis, nei yra\n"
-"\t  dabar. Tai rei�kia, kad tu tur�si ma�iau laisvos vietos Windows'uose "
+"  Prie� pasirinkdamas �� sprendim�, suprask, kad Microsoft Windows skirsnio "
+"dydis bus ma�esnis, nei yra\n"
+"  dabar. Tai rei�kia, kad tu tur�si ma�iau laisvos vietos Windows'uose "
 "�ra�yti duomenims bei �diegti naujas\n"
-"\t  programas.\n"
+"  programas.\n"
 "\n"
 "\n"
-"\t* Eksperto re�imas: jei tu nori rankomis sudalinti skirsniais savo kiet�j� "
+"* Eksperto re�imas: jei tu nori rankomis sudalinti skirsniais savo kiet�j� "
 "disk�, gali rinktis �� variant�. �d�miai\n"
-"\t  pagalvok, prie� pasirinkdamas �� sprendim�. Jis yra galingas, ta�iau "
-"labai pavojingas. Tu gali prarasti \n"
-"\t  visus savo duomenis labai lengvai. Taigi, nesirink �io sprendimo, nebent "
+"  pagalvok, prie� pasirinkdamas �� sprendim�. Jis yra galingas, ta�iau labai "
+"pavojingas. Tu gali prarasti \n"
+"  visus savo duomenis labai lengvai. Taigi, nesirink �io sprendimo, nebent "
 "tikrai �inai, k� darai."
 
-#: ../../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 ""
+"Bet kokie naujai sukurti skirsniai turi b�ti su�ym�ti, kad juos\n"
+"b�t� galima naudoti (su�ym�jimas rei�kia byl� sistemos suk�rim�).\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"
+"Dabar tu gali nor�ti i� naujo su�ym�ti kai kuriuos esamus skirsnius, kad\n"
+"i�trintum duomenis i� j�. Jei nori tai padaryti, pa�ym�k ir tuos skirsnius,\n"
+"kuriuos nori su�ym�ti.\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"
+"Pastaba: neb�tina i� naujo su�ym�ti vis� anks�iau sukurt� skirsni�.\n"
+"Tu privalai su�ym�ti i� naujo skirsnius, kuriuose bus operacij� sistema\n"
+"(tokius kaip \"/\", \"/usr\" ar \"/var\"), ta�iau skirsni� su duomenimis, "
+"kuriuos\n"
+"nori i�laikyti, su�ym�ti nereikia (da�niausiai \"/home\").\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"
+"B�k atsargus, pasirinkdamas skirsnius, kadangi su�ymint visi duomenys\n"
+"bus i�trinti, ir nebebus �manoma j� atstatyti.\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
 "\n"
+"Spausk \"Gerai\", kai b�si pasiruo��s skirsni� su�ym�jimui.\n"
+"\n"
+"\n"
+"Spausk \"At�aukti\", jei nori pasirinkti kitus skirsnius, � kuriuos �diegti\n"
+"Mandrake Linux sistem�."
+
+#: ../../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 ""
+"Tavo naujoji Mandrake Linux operacij� sistema �iuo metu yra\n"
+"�diegiama. �is veiksmas tur�t� kelet� minu�i� u�trukti (tai priklauso nuo\n"
+"�diegiam� paket� bendro dyd�io bei kompiuterio spartos).\n"
+"\n"
+"\n"
+"Pra�om tur�ti kantryb�s."
+
+#: ../../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"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\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 ""
-"Dabar tu turi pasirinkti, kuriuos skirsnius naudoti tavo naujai Linux-"
-"Mandrake \n"
+"Dabar tu turi pasirinkti, kuriuos skirsnius naudoti tavo naujai Mandrake "
+"Linux \n"
 "sistemai �diegti. Jei skirsniai jau buvo apibr��ti (i� praeito �diegimo arba "
 "kitu dalinimo �rankiu),\n"
 "tu gali naudoti esan�ius skirsnius. Kitu atveju, skirsniai turi b�ti "
@@ -2388,174 +2749,49 @@ msgstr ""
 "\n"
 "Kai skirsnis yra parinktas, gali naudoti:\n"
 "\n"
-"\t* Ctrl-c kad sukurtum nauj� skirsn� (jei parinktas tu��ias skirsnis)\n"
+"* Ctrl-c kad sukurtum nauj� skirsn� (jei parinktas tu��ias skirsnis)\n"
 "\n"
-"\t* Ctrl-d kad i�trintum skirsn�.\n"
+"* Ctrl-d kad i�trintum skirsn�.\n"
 "\n"
-"\t* Ctrl-m kad nurodytum prijungim� ta�k�."
+"* Ctrl-m kad nurodytum prijungim� ta�k�."
 
-#: ../../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"
+"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"
-"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"
+"\"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 ""
-"Auk��iau yra s�ra�as Linux skirsni�, kuriuos pavyko rasti tavo\n"
-"kietajame diske. Tu gali pasilikti sprendimus, padarytus meistro, jie tinka\n"
-"daugumai atvej�. Jei nori pakeisti �iuos sprendimus, tu turi nurodyti bent\n"
-"�aknin� skirsn� (\"/\"). Nepasirink per ma�o skirsnio, nes tuomet tu "
-"negal�si\n"
-"�diegti pakankamai programin�s �rangos. Jei tu nori laikyti savo duomenis\n"
-"atskirame skirsnyje, pasirink, kur� naudosi \"/home\" (�manoma tik jei turi "
-"daugiau\n"
-"nei vien� Linux skirsn�).\n"
-"\n"
-"Tavo �iniai, skirsniai ra�omi tokiu pavidalu: \"Pavadinimas\", \"Talpa\".\n"
-"\n"
-"\n"
-"\"Pavadinimas\" sudaromas taip: \"kaupiklio tipas\", \"kaupiklio numeris\",\n"
-"\"skirsnio numeris\" (pavyzd�iui \"hda1\").\n"
-"\n"
-"\n"
-"\"Kieto disko tipas\" yra \"hd\", jei tavo kietasis kaupiklis yra IDE tipo, "
-"ir \"sd\", jeigu\n"
-"tai SCSI kaupiklis.\n"
-"\n"
-"\n"
-"\"kaupiklio numeris\" visada yra raid� po \"sd\" arba \"hd\". IDE "
-"kaupikliams:\n"
-"\n"
-"   * \"a\" rei�kia \"pagrindinis (master) diskas, prijungtas prie pirmojo "
-"(primary) IDE valdiklio\",\n"
-"\n"
-"   * \"b\" rei�kia \"�alutinis (slave) diskas, prijungtas prie pirmojo IDE "
-"valdiklio\",\n"
-"\n"
-"   * \"c\" rei�kia \"pagrindinis diskas, prijungtas prie antrojo (secondary) "
-"IDE valdiklio\",\n"
-"\n"
-"   * \"d\" rei�kia \"�alutinis diskas, prijungtas prie antrojo IDE valdiklio"
-"\",\n"
-"\n"
-"\n"
-"Su SCSI kaupikliais, \"a\" rei�kia \"pirmasis diskas\", \"b\" rei�kia "
-"\"antrasis diskas\" ir t.t."
-
-#: ../../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 ""
-"Pasirink kiet�j� disk�, kur� nori i�tu�tinti, kad �diegtum nauj�\n"
-"Linux-Mandrake sistem�. B�k atsargus, visi duomenys, esantys jame, bus\n"
-"prarasti, ir j� nebebus �manoma atkurti."
-
-#: ../../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 ""
-"Spausk \"Gerai\", jei nori i�trinti visus duomenis ir skirsnius, esan�ius\n"
-"�iame kietajame diske. B�k atsargus, kai paspausi \"Gerai\", tu nebegal�si\n"
-"atkurti joki� duomen� nei skirsni�, kurie buvo �iame diske, �skaitant bet\n"
-"kokius Windows duomenis.\n"
-"\n"
-"\n"
-"Spausk \"At�aukti\", kad nutrauktum operacij� ir neprarastum joki� duomen�\n"
-"nei skirsni�, esan�i� �iame kietajame diske."
-
-#: ../../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 ""
 "Tavo kietajame diske buvo aptiktas vienas ar daugiau Microsoft Windows\n"
 "skirsnis. Pra�om pasirinkti, kurio i� j� dyd� nori pakeisti, kad �diegtum "
 "savo\n"
-"nauj�j� Linux-Mandrake operacij� sistem�.\n"
+"nauj�j� Mandrake Linux operacij� sistem�.\n"
 "\n"
 "\n"
 "Tavo �iniai, kiekvienas skirsnis s�ra�e u�ra�omas pavidalu \"Linux "
@@ -2595,920 +2831,428 @@ msgstr ""
 "Windows'uose\n"
 "(pirmasis disko skirsnis vadinamas \"C:\")"
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr "Pra�om tur�ti kantryb�s. �is veiksmas gali kelet� minu�i� u�trukti."
 
-#: ../../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"
-"\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 be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\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"
-"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 ""
-"Bet kokie naujai sukurti skirsniai turi b�ti su�ym�ti, kad juos\n"
-"b�t� galima naudoti (su�ym�jimas rei�kia byl� sistemos suk�rim�).\n"
+"Pra�om pasirinkti ��diegti�, jei � sistem� n�ra �diegta ankstesni� Mandrake "
+"Linux versij�,\n"
+"arba jei nori naudoti kelias operacij� sistemas.\n"
 "\n"
-"\n"
-"Dabar tu gali nor�ti i� naujo su�ym�ti kai kuriuos esamus skirsnius, kad\n"
-"i�trintum duomenis i� j�. Jei nori tai padaryti, pa�ym�k ir tuos skirsnius,\n"
-"kuriuos nori su�ym�ti.\n"
+"Pra�om pasirinkti �Atnaujinti�, jei nori atnaujinti jau �diegt� Mandrake "
+"Linux versij�.\n"
 "\n"
 "\n"
-"Pastaba: neb�tina i� naujo su�ym�ti vis� anks�iau sukurt� skirsni�.\n"
-"Tu privalai su�ym�ti i� naujo skirsnius, kuriuose bus operacij� sistema\n"
-"(tokius kaip \"/\", \"/usr\" ar \"/var\"), ta�iau skirsni� su duomenimis, "
-"kuriuos\n"
-"nori i�laikyti, su�ym�ti nereikia (da�niausiai \"/home\").\n"
-"\n"
+"Priklausomai nuo tavo �ini� apie GNU/Linux, tu gali pasirinkti �ias klases "
+"�diegti ar atnaujinti \n"
+"Mandrake Linux operacij� sistem�:\n"
 "\n"
-"B�k atsargus, pasirinkdamas skirsnius, kadangi su�ymint visi duomenys\n"
-"bus i�trinti, ir nebebus �manoma j� atstatyti.\n"
+"* Rekomenduojama: jei niekad nesi �dieg�s GNU/Linux operacij� sistemos, "
+"pasirink �i�. �diegimas bus labai\n"
+"  lengvas, tav�s bus paklausta tik keletas klausim�.\n"
 "\n"
 "\n"
-"Spausk \"Gerai\", kai b�si pasiruo��s skirsni� su�ym�jimui.\n"
+"* Prisitaikyta: jei esi pakankamai susipa�in�s su GNU/Linux, tu gali "
+"pasirinkti pagrindin� sistemos paskirt�\n"
+"(darbo stotis, serveris, k�rimo). Tu tur�si atsakyti � daugiau klausim�, nei "
+"�Rekomenduojamoje� �diegimo\n"
+"klas�je, taigi turi �inoti, kaip veikia GNU/Linux, kad pasirinktum �i� "
+"klas�.\n"
 "\n"
 "\n"
-"Spausk \"At�aukti\", jei nori pasirinkti kitus skirsnius, � kuriuos �diegti\n"
-"Linux-Mandrake sistem�."
+"* Eksperto: jei gerai i�manai GNU/Linux, gali pasirinkti �i� �diegimo klas�. "
+"kaip ir �Prisitaikytoje� klas�je,\n"
+"  tu gal�si pasirinkti pagrindin� sistemos paskirt�\t(darbo stotis, "
+"serveris, k�rimo). B�k labai atsargus, prie� \n"
+"  pasirinkdamas �i� �diegimo klas�. Tu gal�si atlikti smarkiai prisitaikyt� "
+"�diegim�.\n"
+"  Atsakyti � kai kuriuos klausimus gali b�ti itin sud�tinga, jei gerai "
+"nei�manai GNU/Linux. Taigi, nesirink �ios\n"
+"  �diegimo klas�s, nebent tikrai �inai, k� darai."
 
-#: ../../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 ""
-"Tu dabar gali pasirinkti grup� paket�, kuriuos nori �diegti\n"
-"ar atnaujinti.\n"
-"\n"
-"\n"
-"DrakX tada patikrins, ar yra pakankamai vietos �diegti juos visus. Jei ne,\n"
-"persp�s tave apie tai. Jei vis tiek nor�si t�sti, pasirinkt� grupi� "
-"�diegimas\n"
-"bus prat�stas, ta�iau kai kurie ma�iau naudingi paketai bus i�mesti. S�ra�o\n"
-"pabaigoje tu gali pasirinkti variant� \"Atskir� paket� pasirinkimas\", tuo "
-"atveju\n"
-"tu gal�si nar�yti po daugiau nei 1000 paket� ir pasirinkti juos po vien�..."
 
-#: ../../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 ""
-"Dabar tu gali pasirinkti po vien� paketus, kuriuos\n"
-"nori �diegti\n"
-"\n"
-"\n"
-"Tu gali i�skleisti ir suskleisti med�, spragtel�damas mygtukus kairiajame\n"
-"apatiniame paket� lango kampe.\n"
-"\n"
-"\n"
-"Jei labiau nor�tum matyti paketus surikiuotus pagal ab�c�l�, spragtel�k ant\n"
-"ikonos \"Perjungti tarp rikiavimo pagal grupes ar ab�c�l�\".\n"
-"\n"
-"\n"
-"Jei nenori, kad tave �sp�t� apie priklausomybes, spragtel�k ant\n"
-"\"Tyliai patenkinti priklausomybes\". Jei taip padarysi, nepamir�k, kad "
-"at�ym�jus\n"
-"vien� paket�, gali b�ti at�ym�ti keletas kit�, kurie nuo jo priklauso."
 
-#: ../../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 ""
-"Jei turi visus CD i� auk��iau esan�io s�ra�o, spausk Gerai.\n"
-"Jei neturi n� vieno i� �i� CD, spausk Nutraukti.\n"
-"Jei tr�ksta tik kai kuri� CD, at�ym�k juos ir tada spausk Gerai."
-
-#: ../../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"
+"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"
-"Please be patient."
-msgstr ""
-"Tavo naujoji Linux-Mandrake operacij� sistema �iuo metu yra\n"
-"�diegiama. �is veiksmas tur�t� kelet� minu�i� u�trukti (tai priklauso nuo\n"
-"�diegiam� paket� bendro dyd�io bei kompiuterio spartos).\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"\n"
-"Pra�om tur�ti kantryb�s."
-
-#: ../../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 ""
-"Tu dabar gali i�bandyti savo pel�. Naudok klavi�us ir ratuk�,\n"
-"kad patikrintum ar nuostatos geros. Jei ne, spausk �Nutraukti�\n"
-"ir pasirink kit� tvarkykl�."
 
-#: ../../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 ""
 "Pra�om pasirinkti teising� prievad�. Pavyzd�iui COM1\n"
 "MS Windows'uose vadinamas ttyS0 GNU/Linux'e."
 
-#: ../../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 ""
-"Jei tu nori prijungti savo kompiuter� prie interneto arba\n"
-"vietinio tinklo, pasirink teising� variant�. Pra�om �jungti �rengin� prie�\n"
-"pasirenkant teising� variant� -- tai leis DrakX automati�kai j� atpa�inti.\n"
-"\n"
-"\n"
-"Jei tu neturi galimyb�s prisijungti nei prie interneto, nei prie vietinio "
-"tinklo,\n"
-"rinkis \"I�jungti tinkl�\".\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"
-"Jei nori sutvarkyti tinkl� v�liau, baigus �diegim�, arba jei jau baigei\n"
-"konfig�ruoti savo tinklo jungtis, rinkis \"Atlikta\"."
-
-#: ../../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 ""
-"Nebuvo aptiktas joks modemas. Pra�om pasirinkti nuosekl�j� prievad�,\n"
-"prie kurio jis yra prijungtas.\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"
-"�inok, kad pirmasis nuoseklusis prievadas (COM1 MS Windows'uose)\n"
-"vadinamas ttyS0 Linux'e."
-
-#: ../../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 ""
-"Tu dabar gali �vesti prisiskambinimo nuostatas. Jei tu\n"
-"ne�inai arba nesi tikras, k� �vesti, teising� informacij� gali gauti i� "
-"savo\n"
-"Interneto paslaug� tiek�jo (IPT). Jei tu ne�vesi DNS (vard� serverio)\n"
-"informacijos �ia, ji bus gauta i� Interneto paslaug� tiek�jo jungimosi metu."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Jei tavo modemas yra i�orinis, pra�om �jungti j� dabar, kad DrakX gal�t� "
-"atpa�inti j� automati�kai."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Pra�au, �junk savo modem� ir pasirink teising�."
-
-#: ../../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 ""
-"Jei tu nesi tikras, ar auk��iau pateikta informacija yra teisinga,\n"
-"arba tiksliai ne�inai, k� �vesti, teising� informacij� gali gauti i� savo\n"
-"Interneto paslaug� tiek�jo (IPT). Jei tu ne�vesi DNS (vard� serverio)\n"
-"informacijos �ia, ji bus gauta i� Interneto paslaug� tiek�jo jungimosi metu."
-
-#: ../../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 ""
-"Tu dabar gali �vesti savo hosto vard�, jei to reikia. Jei tu\n"
-"ne�inai arba nesi tikras, k� �vesti, teising� informacij� gali gauti i� "
-"savo\n"
-"Interneto paslaug� tiek�jo (IPT)."
-
-#: ../../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 ""
-"Tu dabar gali sutvarkyti savo tinklo �rengin�:\n"
-"\n"
-"   * IP adresas: jeigu jo ne�inai, arba nesi tikras k� �vesti, pasiklausk "
-"savo tinklo administratoriaus.\n"
-"     Tu tur�tum ne�vesti IP adreso, jei pasirenki \"Automatinis IP\" "
-"�emiau.\n"
-"\n"
-"   * Netmask: \"255.255.255.0\" da�niausiai yra neblogas pasirinkimas. Jeigu "
-"ne�inai, arba nesi tikras\n"
-"     k� �vesti, pasiklausk savo tinklo administratoriaus.\n"
-"\n"
-"   * Automatinis IP: Jeigu tavo tinkle naudojamas BOOTP ar DHCP protokolas, "
-"pasirink �� variant�.\n"
-"     Jeigu pasirinksi j�, nereik�s nieko �ra�yti prie \"IP adreso\". Jeigu "
-"tu ne�inai, arba nesi tikras, ar reikia\n"
-"     pasirinkti �� variant�, pasiklausk tinklo administratoriaus."
-
-#: ../../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 ""
-"Tu dabar gali �vesti savo hosto vard�. Jeigu jo ne�inai,\n"
-"arba nesi tikras k� �vesti, pasiklausk savo tinklo administratoriaus."
-
-#: ../../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 ""
-"Tu dabar gali �vesti savo hosto vard�, jei to reikia. Jei tu ne�inai\n"
-"arba nesi tikras, k� �vesti, palik tu��ia."
-
-#: ../../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 ""
-"Dabar tu gali �vesti prisiskambinimo nuostatas. Jeigu tu gerai ne�inai,\n"
-"k� �ra�yti, teising� informacij� gali gauti i� savo 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 ""
-"Jeigu tu naudosi proxy, pra�om dabar juos nustatyti. Jeigu tu dar ne�inai,\n"
-"ar tur�tum naudoti proxy, pasiklausk tinklo administratoriaus arba 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 ""
-"Dabar tu gali �diegti kriptografijos paket�, jeigu tavo interneto juntis "
-"buvo\n"
-"gerai sutvarkyta. Prad�iai pasirink atvaizd� (mirror), i� kurio parsi�sti "
-"paketus,\n"
-"o po to pa�ym�k, kuriuos paketus �diegti.\n"
-"\n"
-"Atmink, kad tu turi pasirinkti atvaizd� ir kriptografijos paketus, "
-"atitinkan�ius\n"
-"�statym� reikalavimus."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr ""
-"Tu dabar gali pasirinkti laiko juost�, priklausomai nuo to, kur gyveni."
-
-#: ../../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 tvarko laik� pagal GMT (Greenwich Mean Time),\n"
-"ir paver�ia j� � vietin� laik� pagal tavo pasirinkt� laiko juost�.\n"
-"\n"
-"\n"
-"Jei tu naudoji Microsoft Windows �iame kompiuteryje, pasirink \"Ne\"."
-
-#: ../../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."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Dabar tu gali pasirinkti tarnybas, kurias nori paleisti �krovos metu.\n"
-"\n"
-"\n"
-"U�vedus �ymekl� ant tarnybos, pasirodys pagalbos u�ra�as, kuris apra�o "
-"tarnybos\n"
-"vaidmen� tavo sistemoje.\n"
-"\n"
-"\n"
-"B�k ypa� atidus �iame �ingsnyje, jeigu �adi naudotis savo kompiuteriu kaip\n"
-"serveriu: tu tikriausiai nor�si nepaleisti joki� nereikaling� tarnyb�.\n"
-"Prisimink, kad kai kurios tarnybos gali b�ti pavojingos, jei naudojamos "
-"serveryje.\n"
-"Apskritai, pa�ym�k tik tas tarnybas, kuri� tau tikrai reikia."
-
-#: ../../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 ""
-"Tu gali sukonfig�ruoti vietin� spausdintuv� (prijungt� prie tavo "
-"kompiuterio) arba\n"
-"nutolus� spausdintuv� (prieinam� per Unix, Netware arba Microsoft Windows "
-"tinkl�)"
 
-#: ../../help.pm_.c:496
+#: ../../help.pm_.c:600
 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"
+"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"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\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"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
-"If you don't have printer, click on \"None\"."
-msgstr ""
-"jei tu nori spausdinimo galimyb�s, pra�om dabar pasirinkti vien� "
-"spausdinimo\n"
-"sistem� i� CUPS ir LPR.\n"
-"\n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-"CUPS yra nauja, galinga ir lanksti spausdinimo sistema Unix sistemoms (CUPS\n"
-"rei�kia \"Common Unix Printing System\"). Tai yra spausdinimo sistema,\n"
-"Linux-Mandrake parenkama pagal nutyl�jim�.\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"
-"LPR yra sena spausdinimo sistema, naudota ankstesn�se Linux-Mandrake\n"
-"versijose.\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"
-"Jei tu neturi spausdintuvo, pasirink \"Jokia\"."
-
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\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"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\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"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\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"
-"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\"."
+"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 ""
-"GNU/Linux gali susitvarkyti su dauguma spausdintuv� tip�. Kiekvienas i�\n"
-"�i� tip� reikalauja skirtingo nustatymo.\n"
-"\n"
-"\n"
-"Jei tavo spausdintuvas yra fizi�kai prijungtas prie tavo kompiuterio,\n"
-"pasirink \"Vietinis spausdintuvas\".\n"
-"\n"
-"\n"
-"Jei nori prieiti prie spausdintuvo, kuris yra nutolusioje Unix sistemoje,\n"
-"pasirink \"Nutol�s spausdintuvas\".\n"
-"\n"
-"\n"
-"Jei nori prieiti prie spausdintuvo, kuris yra nutolusiame Microsoft Windows\n"
-"kompiuteryje (arba Unix kompiuteryje, naudojan�iame SMB protokol�), "
-"pasirink\n"
-"\"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 ""
-"Pra�au, �junk savo spausdintuv� prie� leisdamas DrakX j� atpa�inti.\n"
-"\n"
-"Tu dabar turi �vesti �iek tiek informacijos.\n"
-"\n"
-"\n"
-"   * Spausdintuvo vardas: spausdinimo kaupykla (spooler) naudoja \"lp\" kaip "
-"�prast� spausdintuvo vard�. Taigi,\n"
-"     tu turi tur�ti spausdintuv�, pavadint� \"lp\". Jei turi tik vien� "
-"spausdintuv�, gali jam parinkti kelet� vard�. Tu \n"
-"     tiesiog turi atskirti juos sta�iu br�k�niu (\"|\"). Taigi, jei patikt� "
-"prasmingesnis vardas, tu turi j� �ra�yti pirm�,\n"
-"     pvz. \"Mano spausdintuvas|lp\". Spausdintuvas, kurio varde yra \"lp\", "
-"bus parenkamas pagal nutyl�jim�.\n"
-"\n"
-"\n"
-"  � * Apra�ymas: jis neb�tinas, bet gali b�ti naudingas, jei prie "
-"kompiuterio yra prijungti keli spausdintuvai arba\n"
-"     leid�iama kitiems kompiuteriams prieiti prie �io spausdintuvo.\n"
-"\n"
-"\n"
-"   * Vieta: jei nori �ra�yti �iek tiek informacijos apie tai, kur tas "
-"spausdintuvas yra, �ra�yk j� �ia (gali ra�yt\n"
-"     k� tik nori, pavyzd�iui \"ant boso stalo\").\n"
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:647
+#, fuzzy
 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"
+"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 acces a printer located on NetWare network, select "
-"\"NetWare\".\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 ""
-"Tu dabar turi �vesti �iek tiek informacijos.\n"
-"\n"
-"\n"
-"   * Spausdintuvo vardas: spausdinimo kaupykla (spooler) naudoja \"lp\" kaip "
-"�prast� spausdintuvo vard�.\n"
-"     Taigi, tu turi tur�ti spausdintuv�, pavadint� \"lp\". Jei turi tik "
-"vien� spausdintuv�, gali jam parinkti kelet�\n"
-"     vard�. Tu tiesiog turi atskirti juos sta�iu br�k�niu (\"|\"). Taigi, "
-"jei patikt� prasmingesnis vardas, tu turi j�\n"
-"     �ra�yti pirm�, pvz. \"Mano spausdintuvas|lp\". Spausdintuvas, kurio "
-"varde yra \"lp\", bus parenkamas\n"
-"     pagal nutyl�jim�.\n"
-"\n"
-"\n"
-"   * Kaupimo (spool) katalogas: tai katalogas, � kur� �ra�omi spausdinimo "
-"darbai. Palik �prast� parinkt�,\n"
-"     jeigu ne�inai k� naudoti.\n"
-"\n"
-"\n"
-"   * Spausdintuvo jungtis: jei tavo spausdintuvas yra fizi�kai prijungtas "
-"prie tavo kompiuterio, rinkis\n"
-"     \"Vietinis spausdintuvas\". Jie nori prieiti prie spausdintuvo, "
-"prijungto prie nutolusio Unix kompiuterio,\n"
-"     pasirink \"Nutol�s lpd spausdintuvas\".\n"
-"\n"
-"\n"
-"\n"
-"     Jei nori prieiti prie spausdintuvo, kuris yra nutolusiame Microsoft "
-"Windows kompiuteryje (arba\n"
-"     Unix kompiuteryje, naudojan�iame SMB protokol�), pasirink \"SMB/Windows "
-"95/98/NT\".\n"
+"LILO (the LInux LOader) ir GRUB yra �krovos tvarkykl�s: jos gali �krauti\n"
+"tiek GNU/Linux, tiek bet koki� kit� operacij� sistem�, esan�i�\n"
+"kompiuteryje. Paprastai tos kitos operacij� sistemos yra teisingai\n"
+"atpa��stamos ir �diegiamos. Jeigu ne, tu gali prid�ti �ra�us pats �iame\n"
+"lange. B�k atidus ir pasirink teisingus parametrus.\n"
 "\n"
 "\n"
-"     Jie nori prieiti prie spausdintuvo, esan�io Netware tinkle, pasirink "
-"\"Netware\".\n"
+"Tu taip pat gali u�drausti pri�jim� prie t� kit� operacij� sistem�\n"
+"bet kam, jei i�trinsi atitinkamus �ra�us. Bet tuo atveju, tau prireiks\n"
+"�krovos diskelio, kad jas �krautum!"
 
-#: ../../help.pm_.c:573
+#: ../../help.pm_.c:658
+#, fuzzy
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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."
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
 msgstr ""
-"Tavo spausdintuvas nebuvo atpa�intas. Pra�om �vesti pavadinim� �renginio,\n"
-"prie kurio jis yra prijungtas.\n"
+"Tu turi nurodyti, kur �ra�yti GNU/Linux paleidimui reikaling� informacij�\n"
 "\n"
 "\n"
-"Tavo �iniai, dauguma spausdintuv� b�na prijungti prie pirmos lygiagre�iosios "
-"jungties.\n"
-"Tai vadinama \"/dev/lp0\" GNU/Linux sistemose, ir \"LPT1\" Microsoft Windows."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Tu dabar turi pasirinkti savo spausdintuv� i� s�ra�o auk��iau."
+"Jeigu tu tiksliai ne�inai, k� darai, pasirink \"Pirmasis kaupiklio sektorius "
+"(MBR)\"."
 
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:665
 msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\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"
-"\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 ""
-"Pra�om pasirinkti teisingas nuostatas, priklausomai nuo spausdintuvo.\n"
-"Pasi�i�r�k � dokumentacij�, jeigu ne�inai, k� �ia �vesti.\n"
-"\n"
-"\n"
-"Tu gal�si i�bandyti nustatymus sekan�iame �ingsnyje, ir sugr���s v�l juos "
-"pakeisti,\n"
-"jeigu neveikia taip, kaip tu nor�tum."
-
-#: ../../help.pm_.c:591
+" * \"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 ""
-"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"
+"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"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
+"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 ""
-"Dabar tu gali �vesti savo Linux-Mandrake sistemos root slapta�od�.\n"
-"Slapta�odis turi b�ti �vestas du kartus patikrinimui, kad abu �ra�ai "
-"sutampa.\n"
+"DrakX bandys surasti PCI SCSI adapter�(-ius). Jei DrakX\n"
+"ras SCSI adapter� ir �inos, koki� tvarkykl� naudoti, ji bus automati�kai\n"
+"�diegta.\n"
 "\n"
 "\n"
-"Root yra sistemos administratorius ir vienintelis vartotojas, kuriam "
-"leid�iama\n"
-"konfig�ruoti sistem�. Taigi, slapta�od� pasirink atsargiai. Neteis�tas root\n"
-"vartojimas gali b�ti ypatingai pavojingas �iai sistemai, duomenims joje ir "
-"kitoms,\n"
-" su ja susijusioms sistemoms.\n"
+"Jei tu neturi SCSI adapterio, turi ISA SCSI adapter� ar PCI SCSI adapter�,\n"
+"kurio DrakX nepa��sta, tav�s bus paklausta, ar sistemoje yra SCSI\n"
+"adapteris. Jei n�ra n� vieno, gali spausti �Ne�. Jei paspausi �Taip�, bus\n"
+"parodytas tvarkykli� s�ra�as, i� kurio gal�si pasirinkti tinkam� savo\n"
+"adapteriui.\n"
 "\n"
 "\n"
-"Slapta�odis turi b�ti raid�i� ir skai�i� mi�inys, ma�iausiai 8 simboli�\n"
-"ilgio. Jis tur�t� niekada neb�ti u�ra�ytas ant popieriaus.\n"
+"Jei tau teks rankomis nurodyti savo adapter�, DrakX papra�ys tav�s\n"
+"nurodyti jo nuostatas. Tu tur�tum leisti DrakX bandyti atpa�inti �rangos\n"
+"nuostatas. Da�niausiai tai suveikia.\n"
 "\n"
 "\n"
-"Nepasidaryk slapta�od�io pernelyg ilgo ir sud�tingo: tu tur�tum j� "
-"prisiminti\n"
-"be ypating� pastang�."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Nor�damas padaryti sistem� saugesne, pasirink \"Naudoti �e��lin� byl�\" ir\n"
-"\"Naudoti MD5 slapta�od�ius\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"Jeigu tavo tinklas naudoja NIS, pasirink \"Naudoti NIS\". Jeigu\n"
-"ne�inai, paklausk tinklo administratoriaus."
+"Jei ne, tau teks nurodyti tvarkykl�s nuostatas. Pra�om per�i�r�ti User "
+"Guide\n"
+"(chapter 3, section \"Collective informations on your hardware\") d�l "
+"patarim�,\n"
+"kaip su�inoti informacij� apie �rangos dokumentacij�, i� gamintojo "
+"svetain�s\n"
+"tinkle (jei turi pri�jim� prie interneto) arba i� Microsoft Windows (jei "
+"turi juos\n"
+"savo sistemoje)."
 
-#: ../../help.pm_.c:617
+#: ../../help.pm_.c:720
 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"
+"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"
-"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"
+"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"
-"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 ""
-"Dabar tu gali sukurti vien� arba daugiau \"paprast�\" vartotoj�.\n"
-"Kiekvienam �mogui, kuriam tu nori leisti naudotis �iuo kompiuteriu,\n"
-"tu gali sukurti vien� ar daugiau s�skait� (account). Atmink, kad\n"
-"kiekvienas vartotojas tur�s savus nustatymus (grafin�s aplinkos,\n"
-"program� nuostatas, ir t.t. ), bei savo \"nam� katalog�\", kuriame\n"
-"tie nustatymai bus laikomi.\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"
-"Pirmiausia, sukurk vartotoj� sau pa�iam! Net jeigu tu b�si vienintelis �io\n"
-"kompiuterio vartotojas, tu NEGALI prisijungti kaip root vartotojas sistemos\n"
-"kasdieniam naudojimui: taip i�kilt� didel� saugumo gr�sm�. Kad padarytum\n"
-"sistem� nebe�manom� naudoti, u�tenka padaryti por� klaid�.\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"
-"Tod�l, tu tur�tum prisijungti prie sistemos, naudodamasis vartotojo "
-"s�skaita,\n"
-"kuri� b�si �ia suk�r�s, o pasisveikinti kaip root tik administravimo ar\n"
-"prie�i�ros darbams."
-
-#: ../../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 ""
-"Sukurti �krovos diskel� labai rekomenduojama. Jei tau nepavykt�\n"
-"�krauti kompiuterio, tai vienintelis b�das i�gelb�ti sistem� jos\n"
-"nediegiant i� naujo."
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\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"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"Tu turi nurodyti, kur �ra�yti GNU/Linux paleidimui reikaling� informacij�\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"
-"Jeigu tu tiksliai ne�inai, k� darai, pasirink \"Pirmasis kaupiklio sektorius "
-"(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 ""
-"Nebent tu tiksliai �inai kit� variant�, �prastas pasirinkimas b�na \"/dev/hda"
-"\"\n"
-"(tai yra pirminis pagrindinis IDE kaupiklis) arba \"/dev/sda\" (pirmas SCSI "
-"diskas)."
-
-#: ../../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"
-"\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"
-"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: 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 ""
-"LILO (the LInux LOader) ir GRUB yra �krovos tvarkykl�s: jos gali �krauti\n"
-"tiek GNU/Linux, tiek bet koki� kit� operacij� sistem�, esan�i�\n"
-"kompiuteryje. Paprastai tos kitos operacij� sistemos yra teisingai\n"
-"atpa��stamos ir �diegiamos. Jeigu ne, tu gali prid�ti �ra�us pats �iame\n"
-"lange. B�k atidus ir pasirink teisingus parametrus.\n"
-"\n"
-"\n"
-"Tu taip pat gali u�drausti pri�jim� prie t� kit� operacij� sistem�\n"
-"bet kam, jei i�trinsi atitinkamus �ra�us. Bet tuo atveju, tau prireiks\n"
-"�krovos diskelio, kad jas �krautum!"
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:765
 #, 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"
+"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"
-"    * 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 ""
-"Pagrindin�s LILO bei GRUB nuostatos yra �ios:\n"
-"  - �krovos �renginys: Nurodo �rengin� (pvz. disko skirsn�), kuriame\n"
-"yra �krovos sektorius. Pasirink \"/dev/hda\", nebent �inai tiksliai kitaip.\n"
+"Yaboot's main options are:\n"
 "\n"
-"\n"
-"  - Pauz� prie� �keliant �prast� atvaizd� (image): Nurodo de�imt�j�\n"
-"sekund�s dali� kiek�, kiek reikia palaukti, prie� paleid�iant pirm� "
-"atvaizd�.\n"
-"Tai naudinga sistemoms, kurios kraunasi i�kart po klaviat�ros �jungimo.\n"
-"�krovos tvarkykl� nelaukia, jeigu \"pauz�\" yra nenurodyta arba lygi "
-"nuliui.\n"
-"\n"
-"\n"
-"  - Vaizdo re�imas: Tai nurodo  VGA re�im�, pasirenkam� paleid�iant.\n"
-"Yra galimos �ios reik�m�s:\n"
-"\n"
-"    * normal: pasirinkti standartin� 80x25 tekstin� re�im�.\n"
-"\n"
-"    * <skai�ius>: naudoti atitinkam� tekstin� re�im�."
-
-#: ../../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"
-"\n"
-"Yaboot 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 ""
 "Yaboot yra NewWorld MacIntosh gele�ies �krovos programa. Ji gali\n"
 "�krauti GNU/Linux, MacOS, arba MacOSX (jeigu egzistuoja j�s� kompiuteryje).\n"
@@ -3555,273 +3299,76 @@ msgstr ""
 "baigsis Open Firmware \n"
 "u�laikymas."
 
-#: ../../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"
+"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"
-"  - Root: The root device or '/' for your Linux installation.\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"
-"  \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"
-"\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"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\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"
+" * \"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"
-"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 ""
-"SILO yra �krovos tvarkykl� SPARC'ams: ji gali �krauti\n"
-"tiek GNU/Linux, tiek bet koki� kit� operacij� sistem�, esan�i�\n"
-"kompiuteryje. Paprastai tos kitos operacij� sistemos yra teisingai\n"
-"atpa��stamos ir �diegiamos. Jeigu ne, tu gali prid�ti �ra�us pats �iame\n"
-"lange. B�k atidus ir pasirink teisingus parametrus.\n"
-"\n"
-"\n"
-"Tu taip pat gali u�drausti pri�jim� prie t� kit� operacij� sistem�\n"
-"bet kam, jei i�trinsi atitinkamus �ra�us. Bet tuo atveju, tau prireiks\n"
-"�krovos diskelio, kad jas �krautum!"
 
-#: ../../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 ""
-"Pagrindin�s SILO nuostatos yra �ios:\n"
-"  - �krovos tvarkykl�s �diegimas: Parodo, kur tu nori pad�ti informacij�,\n"
-"reikaling� �krauti GNU/Linux. Pasirink \"Pirmasis kaupiklio sektorius (MBR)"
-"\",\n"
-"nebent �inai tiksliai kitaip.\n"
-"\n"
-"\n"
-"  - Pauz� prie� �keliant �prast� atvaizd� (image): Nurodo de�imt�j�\n"
-"sekund�s dali� kiek�, kiek reikia palaukti, prie� paleid�iant pirm� "
-"atvaizd�.\n"
-"Tai naudinga sistemoms, kurios kraunasi i�kart po klaviat�ros �jungimo.\n"
-"�krovos tvarkykl� nelaukia, jeigu \"pauz�\" yra nenurodyta arba lygi nuliui."
+"Pasirink kiet�j� disk�, kur� nori i�tu�tinti, kad �diegtum nauj�\n"
+"Mandrake Linux sistem�. B�k atsargus, visi duomenys, esantys jame, bus\n"
+"prarasti, ir j� nebebus �manoma atkurti."
 
-#: ../../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"
-"\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"
-"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 ""
-"At�jo laikas sukonfig�ruoti X Window sistem�, kuri yra GNU/Linux GUI\n"
-"(Grafin�s vartotojo s�sajos) pagrindas. Kad tai padarytum, tau\n"
-"reikia sukonfig�ruoti vaizdo plok�t� bei monitori�. Dauguma �ingsni�\n"
-"yra automatizuoti, ir tavo darbas gal b�t bus tik patikrinti, kas buvo\n"
-"atlikta, ir pritarti nuostatoms :)\n"
+"Spausk \"Gerai\", jei nori i�trinti visus duomenis ir skirsnius, esan�ius\n"
+"�iame kietajame diske. B�k atsargus, kai paspausi \"Gerai\", tu nebegal�si\n"
+"atkurti joki� duomen� nei skirsni�, kurie buvo �iame diske, �skaitant bet\n"
+"kokius Windows duomenis.\n"
 "\n"
 "\n"
-"Kai konfig�ravimas bus baigtas, bus paleisti X'ai (nebent papra�ysi\n"
-"DrakX, kad to nedaryt�) tam, kad gal�tum patikrinti ir pamatytum,\n"
-"ar nuostatos tau tinka. Jeigu ne, tu gali sugr��ti ir pakeisti jas,\n"
-"tiek kart�, kiek reik�s."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"Jeigu kas nors su X konfig�racija yra netvarkoje, naudok �ias parinktis\n"
-"teisingai nustatyti X Window sistemai."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Jeigu tu nori pasisveikinti grafiniam re�ime, pasirink \"Taip\".\n"
-"Kitu atveju rinkis \"Ne\"."
-
-#: ../../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 ""
+"Spausk \"At�aukti\", kad nutrauktum operacij� ir neprarastum joki� duomen�\n"
+"nei skirsni�, esan�i� �iame kietajame diske."
 
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"Tavo sistem� ruo�iamasi perkrauti.\n"
-"\n"
-"Po perkrovimo tavo naujoji Linux Mandrake sistema bus �krauta\n"
-"automati�kai. Jeigu nori pakrauti kit� operacij� sistem�, pra�om\n"
-"perskaityti papildomas instrukcijas."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Pasirink savo kalb�"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Parink �diegimo klas�"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Kieto disko nustatymas"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Pel�s nustatymas"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Pasirink klaviat�r�"
-
-#: ../../install2.pm_.c:42
-#, fuzzy
-msgid "Security"
-msgstr "curly"
 
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Nustatyti byl� sistemas"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Su�ym�ti skirsnius"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Pasirinkti paketus"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "�diegti sistem�"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Nurodyti root slapta�od�"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Prid�ti vartotoj�"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Nustatyti tinkl�"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Apibendrinimas"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Nustatyti servisus"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Sukurti �krovos diskel�"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "�diegti �krovos tvarkykl�"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Nustatyti X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "I�eiti i� �diegimo"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3836,20 +3383,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 "Negalima naudoti transliavimo be NIS domeno"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "�d�k FAT formatuot� diskel� � kaupikl� %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''"
@@ -3857,30 +3404,20 @@ msgstr ""
 "Kad i�saugoti �i� paket� pasirinkim� �kraukite sistem� su ``linux "
 "defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Klaida skaitant byl� $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Klaida skaitant byl� %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 "Gerai"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Pra�om i�bandyti pel�"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Kad su�adintum pel�,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "PASUK RATUK�!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3892,7 +3429,7 @@ msgstr ""
 "gali\n"
 "rasti �ia: %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"
@@ -3902,11 +3439,11 @@ msgstr ""
 "(arba spragtel�k ant jau esamo). Tada pasirink\n"
 "veiksm� �Montavimo ta�kas� ir nurodyk jam �/�"
 
-#: ../../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 "Tu privalai tur�ti swap skirsn�"
 
-#: ../../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"
@@ -3916,55 +3453,60 @@ msgstr ""
 "\n"
 "Vis tiek t�sti?"
 
-#: ../../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 "Tu privalai tur�ti swap skirsn�"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Naudoti laisv� viet�"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Naujiems skirsniams nepakanka laisvos vietos"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Naudoti esam� skirsn�"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "N�ra jokio skirsnio, tinkamo naudojimui"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Naudoti Windows skirsn� loopback'ui"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Kuri skirsn� tu nori naudoti Linux4Win �diegimui?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Pasirink dyd�ius"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "�akninio skirsnio dydis, MB: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Swap skirsnio dydis, MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Naudoti laisv� viet� Windows skirsnyje"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Kurio skirsnio dyd� tu nori pakeisti?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Skai�iuojami Windows byl� sistemos r��iai"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3973,12 +3515,12 @@ msgstr ""
 "FAT dyd�io keitimo programa nesusitvarko su tavo\n"
 "skirsniu, �vyko tokia klaida: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Tavo Windows skirsnis yra pernelyg fragmentuotas, pirma paleisk �defrag�"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3998,21 +3540,21 @@ msgstr ""
 "prad�ti �diegim�. Taip pat tur�tum pasidaryti atsargin� duomen� kopij�.\n"
 "Kai viskas sutvarkyta, spausk Gerai."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Kok� dyd� nor�tum palikti Windows'ams"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "skirsnyje %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Nepavyko pakeisti FAT dyd�io: %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)"
@@ -4021,32 +3563,32 @@ msgstr ""
 "loopback'ui\n"
 "(arba n�ra pakankamai laisvos vietos)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "I�trinti vis� disk�"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "I�mesti 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 "Tu turi daugiau negu vien� kiet� disk�, � kur� nori �diegti 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 "VISI kaupiklyje %s esantys skirsniai ir duomenys bus prarasti"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Rankinis disk� skirstymas"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Naudoti fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4055,28 +3597,28 @@ msgstr ""
 "Tu dabar gali sudalinti %s.\n"
 "Kai baigsi, nepamir�k i�saugoti su '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 skirsnyje n�ra pakankamai laisvos vietos"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "A� niekur negaliu rasti vietos �diegimui"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX Skirsni� dalinimo meistras rado tokius sprendimus:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Dalinimas � skirsnius nepavyko: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Paleid�iamas tinklas"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "I�jungiamas tinklas"
 
@@ -4088,12 +3630,12 @@ msgstr ""
 "�vyko klaida, bet a� ne�inau, kaip su ja gra�iai susitvarkyti.\n"
 "T�sk darb� savo paties rizika."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Pasikartojantis montavimo ta�kas %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"
@@ -4105,16 +3647,16 @@ msgstr ""
 "Patikrink CD �diegtame kompiuteryje, naudodamas \"rpm -qpl Mandrake/RPMS/*."
 "rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Sveiki atvyk� � %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Neprieinamas n� vienas diskeli� kaupiklis"
 
-#: ../../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"
@@ -4128,32 +3670,32 @@ msgstr "Pasirink dyd�, kiek nori visko �diegti"
 msgid "Total size: "
 msgstr "Bendras dydis: "
 
-#: ../../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 "Versija: %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 "Dydis: %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 "Pasirink paketus, kuriuos tu nori �diegti"
 
-#: ../../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 "�diegti"
 
-#: ../../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 "�diegiama"
 
@@ -4161,7 +3703,7 @@ msgstr "�diegiama"
 msgid "Please wait, "
 msgstr "Pra�om palaukti, "
 
-#: ../../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 "Liko laiko "
 
@@ -4170,21 +3712,21 @@ msgid "Total time "
 msgstr "Bendra trukm� "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Ruo�iamas �diegimas"
 
-#: ../../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 "�diegiamas paketas %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 "Vis tiek t�sti?"
 
-#: ../../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 "�vyko klaida, bandant sutvarkyti paketus:"
 
@@ -4192,28 +3734,32 @@ msgstr "�vyko klaida, bandant sutvarkyti paketus:"
 msgid "Use existing configuration for X11?"
 msgstr "Naudoti esamus X11 nustatymus?"
 
-#: ../../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 ""
 "Tavo sistemoje ma�ai resurs�. Tu gali susidurti su b�domis, �diegdamas\n"
-"Linux-Mandrake. Jei taip atsitikt�, gali pabandyti tekstin� diegimo b�d�:\n"
+"Mandrake Linux. Jei taip atsitikt�, gali pabandyti tekstin� diegimo b�d�:\n"
 "Kai u�sikrauna i� CDROM'o, paspausk `F1', o tada �vesk \"text\"."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "�diegimo klas�"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Pra�om pasirinkti vien� i� �i� �diegimo klasi�:"
 
-#: ../../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 "Grupi�, kurias tu pasirinkai, bendras dydis yra apie %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"
@@ -4228,7 +3774,7 @@ msgstr ""
 "Jei procent� ma�ai, bus �diegti tik patys svarbiausi paketai;\n"
 "su 100% bus �diegti visi pa�ym�ti paketai."
 
-#: ../../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"
@@ -4245,84 +3791,68 @@ msgstr ""
 "Jei procent� ma�ai, bus �diegti tik patys svarbiausi paketai;\n"
 "su %d%% bus �diegt� tiek paket�, kiek tik �manoma."
 
-#: ../../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 "Sekan�iame �ingsnyje tu juos gal�si pasirinkti tiksliau."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Kiek procent� paket� �diegti"
 
-#: ../../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� grupi� pasirinkimas"
 
-#: ../../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 "Atskir� paket� pasirinkimas"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "I�skleisti med�"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Suskleisti med�"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Perjungti tarp rikiavimo pagal grupes ar ab�c�l�"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Bendras dydis: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Blogas paketas"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Pavadinimas: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Svarba: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Bendras dydis: %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 ""
 "Tu negali pasirinkti �io paketo, kadangi neb�ra pakankamai vietos jam �diegti"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Ruo�iamasi �diegti �iuos paketus"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Ruo�iamasi pa�alinti �iuos paketus"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Tu negali pa�ym�ti/at�ym�ti �io paketo"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Tai yra privalomas paketas, jis negali b�ti at�ym�tas"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "Tu negali at�ym�ti �io paketo. Jis jau yra �diegtas"
 
-#: ../../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?"
@@ -4330,24 +3860,43 @@ msgstr ""
 "�is paketas privalo b�ti atnaujintas\n"
 "Ar tu tikrai nori j� at�ym�ti?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Tu negali at�ym�ti �io paketo. Jis privalo b�ti atnaujintas"
 
-#: ../../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 "I�saugoti � diskel�"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "I�saugoti paket� pasirinkim�"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "I�mesti"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Skai�iuojama"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Pra�ome palaukti. Ruo�iamas �diegimas"
 
-#: ../../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"
@@ -4408,15 +3957,15 @@ msgstr ""
 "j� autoriams ir saugomos intelektualios nuosavyb�s teises\n"
 "saugan�i� �statym�.\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 "Sutinku"
 
-#: ../../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 "Atmetu"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4430,7 +3979,7 @@ msgstr ""
 "Pra�om �ki�ti CD su u�ra�u �%s� � kaupikl�, tada paspausk Gerai.\n"
 "Jei tu jo neturi, spausk Nutraukti, kad i�vengtum �diegimo i� �io CD."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "�vyko klaida, �diegiant paketus:"
 
@@ -4438,34 +3987,21 @@ msgstr "�vyko klaida, �diegiant paketus:"
 msgid "An error occurred"
 msgstr "�vyko klaida"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Pra�om pasirinkti kalb�, kuri� naudosi."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "Tu gali pasirinkti kitas kalbas, kurios bus prieinamos po �diegimo"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Visos"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Licenzijos patvirtinimas"
 
-#: ../../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"
@@ -4519,7 +4055,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"
@@ -4556,7 +4092,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"
@@ -4576,104 +4112,100 @@ 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 "Klaviat�ra"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Pra�om pasirinkti klaviat�ros i�d�stym�."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "�ia yra galim� klaviat�r� s�ra�as"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "�diegimo klas�"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Kurios �diegimo klas�s tu nori?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "�diegti/Atnaujinti"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Ar tai �diegimas, ar atnaujinimas?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Rekomenduojama"
 
-#: ../../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 "Eksperto"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Atnaujinimas"
 
-#: ../../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 "Pra�om pasirinkti savo pel�s r���."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Pel�s prievadas"
 
-#: ../../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 ""
 "Pra�om pasirinkti, prie kurios nuosekliosios jungties prijungta tavo pel�."
 
-#: ../../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 "Nustatomos PCMCIA plok�tes..."
 
-#: ../../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 "Nustatome 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 "n�ra prieinam� skirsni�"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Per�i�rimi skirsniai, ie�kant montavimo ta�k�"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Pasirink montavimo ta�kus"
 
-#: ../../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"
@@ -4690,7 +4222,7 @@ msgstr ""
 "\n"
 "Ar sutinki prarasti visus skirsnius?\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!"
@@ -4698,79 +4230,120 @@ msgstr ""
 "DiskDrake nesugeb�jo teisingai perskaityti skirsni� lentel�s.\n"
 "T�sk savo paties rizika!"
 
-#: ../../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 "Nerastas pagrindinis skirsnis"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "�akninis skirsnis"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Kur yra tavo sistemos �akninis skirsnis (/)?"
 
-#: ../../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 ""
 "Tau reikia perkrauti kompiuter�, kad skirsni� lentel�s pakeitimai b�t� "
 "naudojami"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Pasirink skirsnius, kuriuos nori su�ym�ti"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Ie�koti blog� blok�?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Su�ymimi skirsniai"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Sukuriama ir su�ymima byla %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Nepakanka swap atminties �diegimo vykdymui, pra�om prapl�sti"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Ie�komi galimi paketai"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Ie�koma atnaujintin� paket�"
 
-#: ../../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 "Tavo sistemoje neu�tenka vietos �diegimui arba atnaujinimui (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Pilnai (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimaliai (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Rekomenduojama (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Prisitaikyti"
 
-#: ../../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 "Atstatyti i� diskelio"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Loading from floppy"
+msgstr "Atstatyti i� diskelio"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Package selection"
+msgstr "Paket� grupi� pasirinkimas"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "�d�k diskel� � kaupikl� %s"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "I�saugoti � diskel�"
+
+#: ../../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"
@@ -4780,12 +4353,12 @@ msgstr ""
 "Jei neturi n� vieno i� �i� CD, spausk Nutraukti.\n"
 "Jei tr�ksta tik kai kuri� CD, at�ym�k juos, o tada spausk Gerai."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM su u�ra�u \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4794,11 +4367,21 @@ msgstr ""
 "�diegiamas paketas %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Konfig�racija po �diegimo"
 
-#: ../../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 "�d�k diskel� � kaupikl� %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "�d�k tu��i� diskel� � kaupikl� %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4853,97 +4436,144 @@ 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 "Pasirink atvaizd� (mirror), i� kurio imti paketus"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 "Jungiamasi prie atvaizd�io (mirror), kad gautume prieinam� paket� s�ra��"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Pasirink paketus, kuriuos tu nori �diegti."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Kokia tavo laiko juosta?"
 
-#: ../../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 "Ar tavo �rangos laikrodis nustatytas 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 serveris"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Nutol�s CUPS serveris"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Spausdintuvo n�ra"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Apibendrinimas"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Pel�"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Laiko juosta"
 
-#: ../../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 "Spausdintuvas"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 #, fuzzy
 msgid "ISDN card"
 msgstr "Vidin� ISDN plok�t�"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 #, fuzzy
 msgid "Sound card"
 msgstr "Standartin�"
 
-#: ../../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 "Kuri� spausdinimo sistem� nori naudoti?"
+#: ../../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 "Naudoti NIS"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+#, fuzzy
+msgid "Local files"
+msgstr "Vietinis spausdintuvas"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Nurodyti root slapta�od�"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Jokio slapta�od�io"
 
-#: ../../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 ""
 "�is slapta�odis yra pernelyg paprastas (turi b�ti bent %d simboli� ilgio)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Naudoti NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autentikacija"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "geltonieji puslapiai"
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "Autentikacija"
+
+#: ../../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 "serveris"
+
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "Autentikacijos NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS domenas"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "NIS serveris"
 
-#: ../../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 "
@@ -4973,19 +4603,19 @@ msgstr ""
 "Jei nori sukurti �krovos diskel� savo sistemai, �ki�k diskel� � pirm�j�\n"
 "�rengin� ir spausk \"Gerai\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Pirmasis diskeli� �renginys"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Antrasis diskeli� �renginys"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Praleisti"
 
-#: ../../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 "
@@ -5011,32 +4641,40 @@ msgstr ""
 "\n"
 "Ar tu nori sukurti �krovos diskel�?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Atleisk, bet neradau jokio diskeli� kaupiklio"
 
-#: ../../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 "Pasirink kaupikl�, kur� nori naudoti �krovos diskeliui sukurti"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "�d�k diskel� � kaupikl� %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Kuriamas �krovos diskelis"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Ruo�iama �krovos tvarkykl�"
 
-#: ../../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 "Ar nori naudoti 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?"
@@ -5044,51 +4682,54 @@ msgstr ""
 "Klaida �diegiant aboot,\n"
 "bandyti �diegti priverstinai, net jei tai sunaikint� pirm�j� skirsn�?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "�diegti �krovos tvarkykl�"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Nepavyko �diegti �krovos tvarkykl�s. �vyko tokia klaida:"
 
-#: ../../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 "�emas"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Vidutinis"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Auk�tas"
 
-#: ../../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 "Pasirink saugumo lyg�"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "Ar tu nori sukurti automatinio �diegimo diskel� Linux dauginimui?"
-
-#: ../../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 "�d�k tu��i� diskel� � kaupikl� %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 "Kuriamas automatinio �diegimo diskelis"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5098,32 +4739,32 @@ msgstr ""
 "\n"
 "Ar tu nori i�eiti dabar?"
 
-#: ../../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 ""
 "Sveikiname. �diegimas baigtas.\n"
 "I�trauk �diegimo laikmenas ir spausk Enter, kad perkrautum.\n"
 "\n"
-"Kad su�inotum apie pataisymus, kurie prieinami �iai Linux-Mandrake laidai,\n"
-"pasi�i�r�k � Errata, kuris yra http://www.linux-mandrake.com/.\n"
+"Kad su�inotum apie pataisymus, kurie prieinami �iai Mandrake Linux laidai,\n"
+"pasi�i�r�k � Errata, kuris yra http://www.mandrakelinux.com/.\n"
 "\n"
 "Informacija apie tavo sistemos konfig�ravim� yra oficialioje\n"
-"Linux-Mandrake User's Guide knygoje."
+"Mandrake Linux User's Guide knygoje."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Sukurti automatinio �diegimo diskel�"
 
-#: ../../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"
@@ -5137,42 +4778,59 @@ msgstr ""
 "\n"
 "J�s galb�t nor�site pakartoti �diegim�.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automatinis"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Parodyti v�l"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "I�saugoti paket� pasirinkim�"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake �diegimas %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux �diegimas %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> tarp element�  | <Tarpas> parenka | <F12> kitas langas "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 #, fuzzy
 msgid "kdesu missing"
 msgstr "nieko"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Pasirink veiksm�"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "I�pl�stinis"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Pra�om palaukti"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "I�skleisti med�"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Suskleisti med�"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Perjungti tarp rikiavimo pagal grupes ar ab�c�l�"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5199,268 +4857,292 @@ msgid "Your choice? (default %s  enter `none' for none) "
 msgstr ""
 "Tavo pasirinkimas? (pagal nutyl�jim� %s, �vesk `none' jei nieko nenori) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "�ek� (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 "Vokie�i�"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvorako"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "Ispan�"
 
-#: ../../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 "Pranc�z�"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norveg�"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Lenk�"
 
-#: ../../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 "�ved�"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Jungtin�s karalyst�s klaviat�ra"
 
-#: ../../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 "JAV klaviat�ra"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "Iranie�i�"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Arm�n� (senoji)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Arm�n� (spausd. ma�in�l�s)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Arm�n� (fonetin�)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaid�anie�i� (lotyni�ka)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaid�anie�i� (kirilica)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belg�"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bulgar�"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazil� (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Baltarusi�"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "�veicar� (Voki�kas i�d�stymas)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "�veicar�. (Pranc�zi�kas i�d�stymas)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "�ek� (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "�ek� (Programuotojo)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Vokie�i� (be mirusi� klavi��)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Dan�"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorako (JAV)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorako (Norveg�)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Est�"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruzin� (\"Rusi�kas\" i�d�stymas)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruzin� (\"Latin\" i�d�stymas)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Graik�"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Vengr�"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Kroat�"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Izraelio"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "�yd� (Fonetin�)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iranie�i�"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Island�"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Ital�"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japoni�ka 106 klavi��"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 #, fuzzy
 msgid "Korean keyboard"
 msgstr "Jungtin�s karalyst�s klaviat�ra"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Lotyn� Amerikos"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Makedonie�i�"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Oland�"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lietuvi� ��ERTY (sena)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lietuvi� ��ERTY (nauja)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lietuvi� \"skai�i� eil�\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lietuvi� \"fonetin�\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Vieta"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Makedonie�i�"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Oland�"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Lenk� (QWERTY i�d�stymas)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Lenk� (QWERTZ i�d�stymas)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugal�"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanadie�i� (Kvebeko)"
 
-#: ../../keyboard.pm_.c:193
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "Rusi�ka (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "�ved�"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "Rusi�ka (Yawerty)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "Rusi�ka (Yawerty)"
+
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Slov�n�"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovak� (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slovak� (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Slovak� (Programuotojo)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbaid�anie�i� (kirilica)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Thai klaviat�ra"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Thai klaviat�ra"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turk� (tradicinis \"F\" modelis)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turk� (�iuolaikinis \"Q\" modelis)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukrainie�i�"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "JAV klaviat�ra (tarptautin�)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamie�i� \"skai�i� eil�\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Jugoslav� (lotyni�kas/kirilikos)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Loopback montavimai %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Pirmiausia i�meskite loginius tomus\n"
 
@@ -5573,170 +5255,221 @@ msgstr "jokios"
 msgid "No mouse"
 msgstr "Pel�s n�ra"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Pra�om i�bandyti pel�"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Kad su�adintum pel�,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "PASUK RATUK�!"
+
+#: ../../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 "Suomi�"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Toliau ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Ankstesnis"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Ar taip teisinga?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Interneto konfig�ravimas"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Prisijungti prie interneto"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Ar nori pabandyti prisijungti prie interneto dabar?"
+#: ../../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 ""
+"Labiausiai paplit�s b�das prisijungti su ADSL yra pppoe.\n"
+"Vis d�lto, kai kurios jungtys gali naudoti PPTP arba DHCP.\n"
+"Jei ne�inai, pasirink 'naudoti pppoe'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "I�bandoma jungtis..."
+#: ../../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 "Sistema dabar prijungta prie interneto."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "naudoti dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr ""
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "naudoti pppoe"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "naudoti 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 ""
-"Neatrodo, kad sistema dabar prijungta prie interneto.\n"
-"Bandyk i� naujo konfig�ruoti jungt�."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Tinklo konfig�ravimas"
-
-#: ../../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 konfig�ravimas"
+"Kur� DHCP klient� nor�tum naudoti?\n"
+"�prasta yra 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 ""
-"Pasirink savo tiek�j�.\n"
-" Jei jo n�ra s�ra�e, pasirink Unlisted"
+"Neradau jokio ethernet tinklo adapterio tavo sistemoje.\n"
+"A� negaliu sutvarkyti �io jungties tipo."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Jungties konfig�ravimas"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Pasirink tinklo interfeis�"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Pra�om u�pildyti arba patikrinti �� laukel�"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Pra�om pasirinkti, kuri� tinklo plok�t� tu nori naudoti prisijungimui prie "
+"interneto"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "Plok�t�s IRQ"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "nerasta jokia tinklo plok�t�"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Plok�t�s mem (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Konfig�ruojamas tinklas"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "Plok�t�s 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 ""
+"Pra�om �vesti savo hosto vard�, jei j� �inai.\n"
+"Kai kuriems DHCP reikia, kad hosto vardas galiot�.\n"
+"tai tur�t� b�ti pilnai apra�ytas hosto vardas, pana�us\n"
+"� \"mano.filialas.istaiga.lt\"."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "Plok�t�s IO_0"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Hosto vardas"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "Plok�t�s 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 "Tinklo Konfig�ravimo Meistras"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Tavo asmeninis tel. numeris"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "I�orin� ISDN plok�t�"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Tiek�jo pavadinimas (pvz. tiekejas.lt)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Vidin� ISDN plok�t�"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Tiek�jo telefono numeris"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Kokios r��ies tavo ISDN jungtis?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Tiek�jo 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 "Tiek�jo DNS 2"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "Aptikta ugniasien�s konfig�racija!"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Skambinimo re�imas"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "Aptikta ugniasien�s konfig�racija!"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Pasisveikinimas (vartotojo vardas)"
+#: ../../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 konfig�ravimas"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Slapta�odis"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Pasirink savo tiek�j�.\n"
+" Jei jo n�ra s�ra�e, pasirink Unlisted"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "�krovos Protokolas"
 
-#: ../../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 "Lik�s pasaulis"
 
-#: ../../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 ""
 "Lik�s pasaulis \n"
 " be D-Channel (nuomojamos linijos)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Kur� protokol� nori naudoti?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Kokios r��ies plok�t� tu turi?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Ne�inau"
 
-#: ../../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"
@@ -5748,19 +5481,19 @@ msgstr ""
 "\n"
 "Jei turi PCMCIA plok�t�, tu turi �inoti jos IRQ bei IO.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Nutraukti"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "T�sti"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Kuri yra tavo ISDN plok�t�?"
 
-#: ../../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."
@@ -5768,114 +5501,63 @@ msgstr ""
 "A� aptikau ISDN PCI plok�t�, ta�iau ne�inau jos tipo. Pasirink vien� PCI "
 "plok�t� sekan�iame ekrane."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Jokia ISDN PCI plok�t� nerasta. pra�om pasirinkti vien� kitame ekrane."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Neradau jokio ethernet tinklo adapterio tavo sistemoje.\n"
-"A� negaliu sutvarkyti �io jungties tipo."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Pasirink tinklo interfeis�"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Pra�om pasirinkti, kuri� tinklo plok�t� tu nori naudoti prisijungimui prie "
-"interneto"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Tinklo interfeisas"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Ar tu sutinki?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Ruo�iamasi i� naujo paleisti tinklo �rengin�:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ADSL nustatymas"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Ar tu nori prisijungti tik �jungus?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr ""
 "Pra�om pasirinkti, prie kurios nuosekliosios jungties yra prijungtas tavo "
 "modemas."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Prisiskambinimo nustatymai"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Jungties pavadinimas"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Telefono numeris"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Pasisveikinimo ID"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autentikacija"
+#: ../../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 "Paremtas skriptu"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Paremtas terminalu"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Domeno vardas"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 #, fuzzy
 msgid "First DNS Server (optional)"
 msgstr "Pirmasis DNS serveris"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 #, fuzzy
 msgid "Second DNS Server (optional)"
 msgstr "Antrasis DNS serveris"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"Ruo�iamasi i� naujo �jungti tinklo �rengin� $netc->{NET_DEVICE}. Ar tu "
-"sutinki?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5883,7 +5565,7 @@ msgstr ""
 "\n"
 "Tu gali atsijungti arba i� naujo nustatyti jungt�."
 
-#: ../../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."
@@ -5891,11 +5573,11 @@ msgstr ""
 "\n"
 "Tu gali i� naujo nustatyti jungt�."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Tu dabar esi prisijung�s prie interneto."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5903,99 +5585,53 @@ msgstr ""
 "\n"
 "Tu gali prisijungti prie interneto arba i� naujo nustatyti jungt�."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Tu dabar nesi prisijung�s prie interneto."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Prisijungti prie interneto"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Atsijungti nuo interneto"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Nustatyti tinklo jungt� (LAN arba interneto)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Interneto jungtis ir nustatymas"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Tinklo Konfig�ravimo Meistras"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "I�orin� ISDN plok�t�"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Vidin� ISDN plok�t�"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Kokios r��ies tavo ISDN jungtis?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Prisijungti prie interneto"
-
-#: ../../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'"
+#: ../../network/netconnect.pm_.c:96
+#, fuzzy, c-format
+msgid "We are now going to configure the %s connection."
 msgstr ""
-"Labiausiai paplit�s b�das prisijungti su ADSL yra pppoe.\n"
-"Vis d�lto, kai kurios jungtys gali naudoti PPTP arba DHCP.\n"
-"Jei ne�inai, pasirink 'naudoti pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "naudoti dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "naudoti pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "naudoti pptp"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "Ruo�iamasi i� naujo �jungti tinklo �rengin� %s. Ar tu sutinki?"
+"\n"
+"Tu gali atsijungti arba i� naujo nustatyti jungt�."
 
-#: ../../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 ""
-"Kur� DHCP klient� nor�tum naudoti?\n"
-"�prasta yra dhcpcd"
+"\n"
+"Tu gali atsijungti arba i� naujo nustatyti jungt�."
 
-#: ../../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 "Tinklo konfig�ravimas"
 
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Ar tu nori i� naujo paleisti tinkl�"
-
-#: ../../netconnect.pm_.c:904
-#, fuzzy, c-format
-msgid ""
-"A problem occured while restarting the network: \n"
-"\n"
-"%s"
-msgstr "Ar tu nori i� naujo paleisti tinkl�"
-
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 #, fuzzy
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -6007,7 +5643,7 @@ msgstr ""
 "Spragtel�kite ant Gerai kad perkonfiguruoti Network/Internet pasijungim� "
 "arbaat�aukti, kad praleisti �� punkt�.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 #, fuzzy
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
@@ -6020,72 +5656,111 @@ msgstr ""
 "Mes ruo�iam�s konfiguruoti j�s� internet/tinklin� pasijungim�.\n"
 "Jeigu nenorite naudoti automatinio aptikimo nuimkite �i� at�ym�.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Konfiguravimui pasirinkite prifail�"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Naudokite automatin� aptikim�"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Ie�koma �ranga..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Nustatyti normali� jungt� per modem�"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "aptiktas prievade %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "ISDN jungtis"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "aptiktas %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (arba ADSL) jungtis"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "LAN jungtis"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "aptiktas interfeise %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Kabelin� jungtis"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#, fuzzy
+msgid "cable connection detected"
+msgstr "Kabelin� jungtis"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "LAN jungtis"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "aptiktos ethernet kortos(a)"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Kaip tu nori prisijungti prie interneto?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "Pasirink kur� �rank� nor�tum naudoti"
+
+#: ../../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 "Interneto jungties dalinimas"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Ar tu nori prisijungti tik �jungus?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Tinklo konfig�ravimas"
+
+#: ../../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 "Ar tu nori i� naujo paleisti tinkl�"
 
-#: ../../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 ""
 "Sveikiname, j�s� tinklo ir Internet konfiguracija baigta.\n"
 "\n"
-"Dabar konfiguracij� pritaikysime sistemai."
+"Dabar konfiguracij� pritaikysime sistemai.\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."
@@ -6093,31 +5768,7 @@ msgstr ""
 "Po to rekomenduojame jums perleisti X aplink�,\n"
 "kad i�vengti problem� su kompiuterio vardu."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "nerasta jokia tinklo plok�t�"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Konfig�ruojamas tinklas"
-
-#: ../../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 ""
-"Pra�om �vesti savo hosto vard�, jei j� �inai.\n"
-"Kai kuriems DHCP reikia, kad hosto vardas galiot�.\n"
-"tai tur�t� b�ti pilnai apra�ytas hosto vardas, pana�us\n"
-"� \"mano.filialas.istaiga.lt\"."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Hosto vardas"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6130,7 +5781,7 @@ msgstr ""
 "Jei pakeisi k� nors �emiau esan�iuose laukuose, tai �sigalios vietoj sen�j� "
 "nuostat�."
 
-#: ../../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"
@@ -6140,38 +5791,38 @@ msgstr ""
 "Kiekvienas laukas turi b�ti �ra�ytas kaip IP adresas\n"
 "de�imtainiais skai�iais su ta�kais (pvz. 192.168.2.36)."
 
-#: ../../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 "Konfig�ruojamas tinklo �renginys %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (tvarkykl� $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (tvarkykl� %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 adresas"
 
-#: ../../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 "Automatinis 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 adresas tur�t� b�ti 1.2.3.4 formato"
 
-#: ../../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"
@@ -6183,43 +5834,150 @@ msgstr ""
 "� \"mano.filialas.istaiga.lt\".\n"
 "Taip pat gali �vesti �liuzo (gateway) IP adres�, jeigu tok� turi"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNS serveris"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "�liuzas (Gateway)"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "�liuzo (gateway) �renginys"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Proxy konfig�racija"
 
-#: ../../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 tur�t� b�ti http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Proxy tur�t� b�ti ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Interneto konfig�ravimas"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Ar nori pabandyti prisijungti prie interneto dabar?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "I�bandoma jungtis..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Sistema dabar prijungta prie interneto."
+
+#: ../../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 ""
+"Neatrodo, kad sistema dabar prijungta prie interneto.\n"
+"Bandyk i� naujo konfig�ruoti jungt�."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Jungties konfig�ravimas"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Pra�om u�pildyti arba patikrinti �� laukel�"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "Plok�t�s IRQ"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Plok�t�s mem (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "Plok�t�s IO"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "Plok�t�s IO_0"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "Plok�t�s IO_1"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Tavo asmeninis tel. numeris"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Tiek�jo pavadinimas (pvz. tiekejas.lt)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Tiek�jo telefono numeris"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Tiek�jo DNS 1 (pasirinktinai)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Tiek�jo DNS 2 (pasirinktinai)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Pasirink klaviat�r�"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Skambinimo re�imas"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "Jungties tipas: "
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Jungties tipas: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Pasisveikinimas (vartotojo vardas)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Slapta�odis"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "I�pl�stiniai skirsniai �ioje platformoje nepalaikomi"
 
-#: ../../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 "
@@ -6229,26 +5987,21 @@ msgstr ""
 "Vienintelis sprendimas yra perkelti pirminius skirsnius taip, kad tu��ia "
 "vieta b�t� �alia i�pl�stini� skirsni�"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Klaida skaitant byl� %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Nepavyko atstatyti i� bylos %s: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Bloga atsargin� byla"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Klaida �ra�ant � byl� %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"
@@ -6278,49 +6031,213 @@ msgstr "nuostabu"
 msgid "maybe"
 msgstr "galb�t"
 
-#: ../../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 "Vietinis spausdintuvas"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Nutol�s spausdintuvas"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Nutol�s CUPS serveris"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Nutol�s lpd serveris"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Tinklo spausdintuvas (lizdas)"
 
-#: ../../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 "Spausdinimo serveris"
 
-#: ../../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 "Spausdintuvo �renginio 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 "(modulis %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Pasirink spausdintuvo jungt�"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Kaip yra prijungtas spausdintuvas?"
+
+#: ../../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 ""
+"Su nutolusiu CUPS serveriu, tau �ioje vietoje nereikia nustatin�ti\n"
+"joki� spausdintuv�; jie bus automati�kai atpa��stami.\n"
+"Jeigu abejoji, pasirink \"Nutol�s CUPS serveris\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Jokia"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Pasirink �prast� vartotoj�:"
+
+#: ../../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 "Pel�"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Nutol�s spausdintuvas"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP adresas tur�t� b�ti 1.2.3.4 formato"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Prievado numeris turi b�ti skai�ius"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Vietinis spausdintuvas"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "CUPS serverio IP"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Prievadas"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "�diegimo Tipo Konfiguracija"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Ie�koma �ranga..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Patikrinti prievadus"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "\"%s\" modelio spausdintuvas buvo aptiktas prie "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Vietinio spausdintuvo jungtis"
 
-#: ../../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"
@@ -6328,37 +6245,60 @@ msgstr ""
 "Prie kurio �renginio yra prijungtas tavo spausdintuvas\n"
 "(atmink, kad /dev/lp0 yra LPT1 ekvivalentas)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Spausdintuvo �renginys"
 
-#: ../../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 "Skaitoma CUPS tvarkykli� duomen�  baz�"
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Nutolusio lpd spausdintuvo nuostatos"
 
-#: ../../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 ""
 "Nor�damas naudotis nutolusia lpd spausdinimo eile, tu turi\n"
 "nurodyti to serverio hosto vard� ir pavadinim� eil�s, kurioje\n"
 "bus talpinami darbai."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "Nutolusio hosto vardas"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Nutolusi eil�"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Nutol�s spausdintuvas"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
+msgstr "Nutolusio hosto vardas"
+
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Nutolusio hosto vardas"
+
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) spausdintuvo nuostatos"
 
-#: ../../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"
@@ -6371,29 +6311,37 @@ msgstr ""
 "jo TCP/IP hosto vardo!) ir galb�t spausdinimo serverio IP adres�,\n"
 "spausdintuvo share'o vard�, vartotojo vard�, slapta�od� ir darbo grup�s vard�"
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "SMB serverio hostas"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "SMB serverio IP"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Share'o vardas"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Darbo grup�"
 
-#: ../../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 spausdintuvo nuostatos"
 
-#: ../../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."
@@ -6404,59 +6352,228 @@ msgstr ""
 "spausdintuvui,\n"
 "prie kurio nori prieiti, bei reikalingus vartotojo vard� ir slapta�od�."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Spausdinimo serveris"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Spausdinimo eil�s pavadinimas"
 
-#: ../../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 "Lizdinio spausdintuvo nuostatos"
 
-#: ../../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 ""
 "Kad gal�tum spausdinti � lizdin� spausdintuv�, turi pateikti\n"
 "spausdintuvo hosto vard� ir, galb�t, prievado numer�."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Spausdintuvo hosto vardas"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Prievadas"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "Spausdintuvo hosto vardas"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Spausdintuvo �renginio 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 "Spausdintuvo vardas"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Apra�ymas"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Vieta"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Tu gali tiesiog �ra�yti URI, kad prieitum prie spausdintuvo su CUPS."
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Skaitoma CUPS tvarkykli� duomen�  baz�"
 
-#: ../../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 "Spausdintuvo jungtis"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "Kokio tipo yra tavo spausdintuvas?"
 
-#: ../../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 "Modemo Nustatymai"
+
+#: ../../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 "Interneto konfig�ravimas"
+
+#: ../../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 "Ar tu nori i�bandyti spausdinim�?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Patikrinti prievadus"
+
+#: ../../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 "Taip, spausdinti abu bandomuosius puslapius"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Spausdintuvas"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Standartin�"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Spausdinamas bandomasis puslapis..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Spausdinamas bandomasis puslapis..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Spausdinamas bandomasis puslapis..."
 
-#: ../../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 ""
 "Bandomasis puslapis buvo nusi�stas spausdinimo demonui.\n"
 "Kol bus prad�ta spausdinti, gali tekti palaukti.\n"
@@ -6465,236 +6582,605 @@ msgstr ""
 "\n"
 "Ar jis veikia teisingai?"
 
-#: ../../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 ""
 "Bandomasis puslapis buvo nusi�stas spausdinimo demonui.\n"
 "Kol bus prad�ta spausdinti, gali tekti palaukti.\n"
 "Ar jis veikia teisingai?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Taip, spausdinti ASCII bandom�j� puslap�"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Taip, spausdinti PostScript bandom�j� puslap�"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Spausdintuvo n�ra"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Taip, spausdinti abu bandomuosius puslapius"
+#: ../../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 "Nustatyti spausdintuv�"
+#: ../../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�jungiamas tinklas"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Spausdintuvo nuostatos"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Lapo dydis"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "Skaitoma CUPS tvarkykli� duomen�  baz�"
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Ar i�stumti lap� po darbo?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Interneto konfig�ravimas"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Uniprint tvarkykl�s nuostatos"
+#: ../../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 "Spalv� gylio nuostatos"
+#: ../../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 "Spausdinti tekst� kaip 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 "Taisyti stair-stepping 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 "Puslapi� skai�ius vienam i�vesties puslapiui"
+#: ../../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 "Kairysis/De�inysis kra�tai ta�kais (1/72 colio)"
+#: ../../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 "Vir�utinis/Apatinis kra�tas ta�kais (1/72 colio)"
+#: ../../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 "Papildomos GhostScript nuostatos"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Papildomos teksto nuostatos"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Atbulin� puslapi� seka"
+#: ../../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 "Ar nori nustatyti spausdintuv�?"
+#: ../../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 ""
+
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Spausdintuvo n�ra"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
 msgstr ""
-"�ia yra �ios spausdinimo eil�s.\n"
-"Tu gali �ia prid�ti daugiau arba pakeisti esamas."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS paleid�iamas"
+#: ../../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 "Skaitoma CUPS tvarkykli� duomen�  baz�"
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Pasirink spausdintuvo jungt�"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Nustatyti spausdintuv�"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Kaip yra prijungtas spausdintuvas?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "I�bandoma jungtis..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Pasirink nutolusio spausdintuvo jungt�"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Nustatyti tinkl�"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitorius nenurodytas"
+
+#: ../../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 ""
-"Su nutolusiu CUPS serveriu, tau �ioje vietoje nereikia nustatin�ti\n"
-"joki� spausdintuv�; jie bus automati�kai atpa��stami.\n"
-"Jeigu abejoji, pasirink \"Nutol�s CUPS serveris\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Konfig�ruojamas tinklas"
+
+#: ../../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 ""
-"Su nutolusiu CUPS serveriu, tau �ioje vietoje nereikia nustatin�ti\n"
-"joki� spausdintuv�; jie bus automati�kai atpa��stami,\n"
-"nebent tu turi server�, kuris yra kitame tinkle; tuomet turi �ra�yti\n"
-"CUPS serverio IP adres� ir galb�t  prievado numer�."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "CUPS serverio 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 "Prievado numeris turi b�ti skai�ius"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Kuri� spausdinimo sistem� nori naudoti?"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Pa�alinti eil�"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Auk�tas"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoji�kas"
+
+#: ../../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 ""
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Kuri� spausdinimo sistem� nori naudoti?"
+
+#: ../../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 ""
-"Kiekviena spausdinimo eil� turi tur�ti pavadinim� (pavyzd�iui, lp).\n"
-"Gali b�ti nurodyti kiti parametrai, tokie kaip spausdintuvo apra�ymas\n"
-"ar jo vieta. Koks �io spausdintuvo vardas ir kaip jis yra prijungtas?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Spausdintuvo vardas"
+#: ../../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 "Apra�ymas"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Vieta"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "Pasirink spausdintuvo jungt�"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Kuri� spausdinimo sistem� nori naudoti?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Nustatyti spausdintuv�"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Spausdintuvo nuostatos"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Skaitoma CUPS tvarkykli� duomen�  baz�"
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "Ar nori nustatyti spausdintuv�?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
+msgid ""
+"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 ""
+
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+#, fuzzy
+msgid "Normal Mode"
+msgstr "Normali"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (�prastas)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Nutol�s CUPS serveris"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Nutol�s CUPS serveris"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Spausdintuvo n�ra"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Ar tu nori i�bandyti nustatymus?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Modemo Nustatymai"
+
+#: ../../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 ""
-"Kiekviena spausdinimo eil� (� kuri� nukreipiami spaudiniai) turi tur�ti\n"
-"pavadinim� (da�niausiai lp) ir kaupimo katalog�, susiet� su ja. Koks "
-"pavadinimas\n"
-"bei katalogas tur�t� b�ti naudojami �iai eilei, ir kaip yra prijungtas "
-"spausdintuvas?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Eil�s pavadinimas"
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Kaupimo katalogas"
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Interneto jungties dalinimas"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
 msgstr "Spausdintuvo jungtis"
 
-#: ../../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 "Spausdinamas bandomasis puslapis..."
+
+#: ../../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 "Nutol�s spausdintuvas"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Skaitoma CUPS tvarkykli� duomen�  baz�"
+
+#: ../../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 "Ar tu nori i� naujo paleisti tinkl�"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Skaitoma CUPS tvarkykli� duomen�  baz�"
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "Proxy konfig�racija"
+
+#: ../../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 "Prievadas"
+
+#: ../../proxy.pm_.c:44
+#, fuzzy
+msgid "Url should begin with 'http:'"
+msgstr "Proxy tur�t� b�ti http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+#, fuzzy
+msgid "The port part should be numeric"
+msgstr "Prievado numeris turi b�ti skai�ius"
+
+#: ../../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 tur�t� b�ti 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 "Automatinis pasisveikinimas"
+
+#: ../../proxy.pm_.c:82
+#, fuzzy
+msgid "password"
+msgstr "Slapta�odis"
+
+#: ../../proxy.pm_.c:84
+#, fuzzy
+msgid "re-type password"
+msgstr "Jokio slapta�od�io"
+
+#: ../../proxy.pm_.c:88
+#, fuzzy
+msgid "The passwords don't match. Try again!"
+msgstr "Slapta�od�iai nesutampa"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Negaliu prid�ti skirsnio prie _formatuoto_ RAID md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Negaliu �ra�yti bylos $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Negaliu �ra�yti bylos %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid nepavyko"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid nepavyko (gal b�t tr�ksta raidtools?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "N�ra pakankamai sri�i� %d lygio RAID\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 yra periodin� komand� tvarkykl�."
 
-#: ../../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."
@@ -6703,7 +7189,7 @@ msgstr ""
 "syslog. Jis taip pat gali b�ti naudojamas kompiuterio i�jungti,\n"
 "kai tr�ksta energijos akumuliatoriuje."
 
-#: ../../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."
@@ -6711,7 +7197,7 @@ msgstr ""
 "Paleid�ia komandas laiku, nurodytu su at komanda, bei paleid�ia\n"
 "susikaupusias komandas tuomet, kai sistema ma�ai apkrauta."
 
-#: ../../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 "
@@ -6724,7 +7210,7 @@ msgstr ""
 "paprasto\n"
 "UNIX cron'o, �skaitant didesn� saugum� ir galingesnes parinktis."
 
-#: ../../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 "
@@ -6735,13 +7221,13 @@ msgstr ""
 "Midnight Commander. Ji suteikia galimyb� konsol�je kopijuoti ir �d�ti su\n"
 "pele, bei i�kviesti kontekstin� meniu."
 
-#: ../../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."
@@ -6749,7 +7235,7 @@ msgstr ""
 "Apache yra World Wide Web serveris. Jis naudojamas pateikti HTML\n"
 "byloms ir 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 "
@@ -6763,13 +7249,13 @@ msgstr ""
 "paslaug� paleidim�, �skaitant telnet, ftp, rsh ir rlogin. Inetd i�jungimas\n"
 "kartu i�jungia visas paslaugas, u� kurias jis yra atsakingas."
 
-#: ../../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"
@@ -6779,23 +7265,23 @@ msgstr ""
 "nurodytas /etc/sysconfig/keyboard byloje. Jis gali b�ti pasirinktas su\n"
 "kbdconfig priemone. Daugumoje kompiuteri� jis turi b�ti �jungtas."
 
-#: ../../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)."
@@ -6804,13 +7290,13 @@ msgstr ""
 "Tai yra tiesiog serveris, paskirstantis spausdinimo darbus spausdintuvui"
 "(ams)."
 
-#: ../../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."
@@ -6818,7 +7304,7 @@ msgstr ""
 "named (BIND) yra Domen� vard� serveris (DNS), naudojamas\n"
 "i�siai�kinti IP adresus pagal hosto vardus."
 
-#: ../../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."
@@ -6826,7 +7312,7 @@ msgstr ""
 "Primontuoja ir numontuoja visas Network File System (NFS), SMB\n"
 "(Lan Manager/Windows), ir NCP (NetWare) montavimo ta�kus."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6834,7 +7320,7 @@ msgstr ""
 "�jungia/I�jungia visas tinklo jungtis, nustatytas paleisti\n"
 "�krovos metu."
 
-#: ../../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"
@@ -6844,7 +7330,7 @@ msgstr ""
 "�i tarnyba teikia NFS serverio funkcionalum�, kuris tvarkomas\n"
 "/etc/exports byloje."
 
-#: ../../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."
@@ -6852,17 +7338,17 @@ msgstr ""
 "NFS yra populiarus protokolas dalintis byloms TCP/IP tinkluose.\n"
 "�i tarnyba teikia NFS byl� u�rakinimo funkcionalum�."
 
-#: ../../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 "
@@ -6874,7 +7360,7 @@ msgstr ""
 "sutvarkytas,\n"
 "tad saugu palikti j� net kompiuteriuose, kuriems jo nereikia."
 
-#: ../../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 "
@@ -6886,7 +7372,7 @@ msgstr ""
 "kompiuteriuose,\n"
 "kurie veikia kaip serveriai protokol�, naudojan�i� PS jungtis."
 
-#: ../../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."
@@ -6894,7 +7380,7 @@ msgstr ""
 "Postfix yra pa�to siuntimo agentas (MTA), tai yra programa,\n"
 "siun�ianti pa�t� i� vieno kompiuterio � kit�."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6902,13 +7388,13 @@ msgstr ""
 "I�saugo ir atkuria sistemos entropijos tvenkin� auk�tesn�s kokyb�s\n"
 "atsitiktini� skai�i� generavimui."
 
-#: ../../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"
@@ -6918,7 +7404,7 @@ msgstr ""
 "naudojant RIP protokol�. RIP pla�iai naudojamas ma�uose tinkluose, ta�iau\n"
 "sud�tinguose tinkluose gali prireikti sud�tingesni� protokol�."
 
-#: ../../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."
@@ -6926,7 +7412,7 @@ msgstr ""
 "rstat protokolas leid�ia tinklo vartotojams i�matuoti\n"
 "vykdymo metrikas bet kuriam kompiuteriui i� tinklo."
 
-#: ../../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."
@@ -6934,7 +7420,7 @@ msgstr ""
 "rusers protokolas leid�ia tinklo vartotojams su�inoti, kas yra\n"
 "prisijung�s prie kit� atsakin�jan�i� kompiuteri�."
 
-#: ../../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)."
@@ -6943,12 +7429,12 @@ msgstr ""
 "vartotoj�, prisijungusi� prie kompiuterio, kuriame veikia rwho demonas\n"
 "(pana�iai kaip finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 #, fuzzy
 msgid "Launch the sound system on your machine"
 msgstr "Startuojant paleisti X_Windows"
 
-#: ../../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."
@@ -6956,45 +7442,88 @@ msgstr ""
 "Syslog yra priemon�, kuri� daugelis demon� naudoja u�ra�yti\n"
 "log �ra�ams � �vairias sistemos log bylas.  Visada pravartu leisti 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 "Paleid�ia ir sustabdo X �rift� server� pakrovimo metu ir i�jungiant."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Pasirink kokias tarnybas �jungus paleisti automati�kai"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Spausdintuvas"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internetas"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Sistemos re�imas"
+
 #: ../../services.pm_.c:137
 #, fuzzy
+msgid "Remote Administration"
+msgstr "Nutolusio lpd spausdintuvo nuostatos"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Serveris, Duomen� bazi�"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "�renginys"
+
+#: ../../services.pm_.c:198
+#, fuzzy
 msgid "running"
 msgstr "D�mesio"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 #, fuzzy
 msgid "stopped"
 msgstr "Pridurti"
 
-#: ../../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 "�diegiamas paketas %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"
@@ -7002,15 +7531,66 @@ msgstr ""
 "A� negaliu perskaityti tavo skirsni� lentel�s, ji man pernelyg sugadinta :(\n"
 "Pabandysiu i�valyti blogus skirsnius"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Klaida"
+
+#: ../../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 "Konfig�racija po �diegimo"
+
+#: ../../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 "�diegimo Tipo Konfiguracija"
+
+#: ../../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 "Sveikiname!"
+
+#: ../../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 "Interneto jungties dalinimas"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Interneto jungties dalinimas �iuo metu �jungtas"
 
-#: ../../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"
@@ -7022,33 +7602,33 @@ msgstr ""
 "\n"
 "Tai k� nor�tum daryti?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "i�jungti"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "nieko"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "i� naujo nustatyti"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 #, fuzzy
 msgid "Disabling servers..."
 msgstr "Ie�koma �ranga..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 #, fuzzy
 msgid "Internet connection sharing is now disabled."
 msgstr "Interneto jungties dalinimas �iuo metu i�jungtas"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Interneto jungties dalinimas �iuo metu i�jungtas"
 
-#: ../../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"
@@ -7060,28 +7640,20 @@ msgstr ""
 "\n"
 "Tai k� nor�tum daryti?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "�jungti"
 
-#: ../../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 "Interneto jungties dalinimas �iuo metu �jungtas"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Nuostat� bylos turinio nepavyko suprasti."
-
-#: ../../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"
@@ -7099,21 +7671,21 @@ msgstr ""
 "\n"
 "Ar nor�tum sutvarkyti interneto jungties dalinim�?"
 
-#: ../../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 "Interfeisas"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Tavo sistemoje nerasta jokia tinklo plok�t�!"
 
-#: ../../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."
@@ -7122,6 +7694,10 @@ msgstr ""
 "nustatymo �rank�."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Tinklo interfeisas"
+
+#: ../../standalone/drakgw_.c:225
 #, fuzzy, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7132,18 +7708,18 @@ msgid ""
 msgstr ""
 "Tavo sistemoje yra tik viena sutvarkyta tinklo plok�t�:\n"
 "\n"
-"$interface\n"
+"%s\n"
 "\n"
 "Ar nor�tum sutvarkyti savo vietin� tinkl� �iai plok�tei?"
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
 "Pra�om pasirinkti, kuri tinklo plok�t� bus prijungta prie vietinio tinklo."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 #, fuzzy
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
@@ -7151,15 +7727,16 @@ msgstr ""
 "�sp�ju, �i tinklo plok�t� jau buvo sutvarkyta.\n"
 "Ar nor�tum nustatyti j� i� naujo?"
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "Rastas galimas LAN adreso konfliktas esamose $_ nuostatose!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "Rastas galimas LAN adreso konfliktas esamose %s nuostatose!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Aptikta ugniasien�s konfig�racija!"
 
-#: ../../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."
@@ -7167,24 +7744,21 @@ msgstr ""
 "�sp�jimas! Aptikta ugniasien�s konfig�racija! Tau gali tekti kai k� "
 "i�taisyti rankomis po �diegimo."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Konfig�ruojama..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Konfig�ruojami skriptai, �diegiamos programos, paleid�iami serveriai..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Yra problem� �diegiant paket� $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Sveikiname!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Yra problem� �diegiant paket� %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 "
@@ -7194,7 +7768,7 @@ msgstr ""
 "Tu gali dabar dalintis interneto jungtimi su kitais kompiuteriais vietiniame "
 "tinkle, naudojant automatin� tinklo konfig�racij� (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 #, fuzzy
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
@@ -7203,7 +7777,7 @@ msgstr ""
 "\n"
 "Tai k� nor�tum daryti?"
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 #, fuzzy
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
@@ -7212,17 +7786,17 @@ msgstr ""
 "\n"
 "Tai k� nor�tum daryti?"
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 #, fuzzy
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Interneto jungties dalinimas �iuo metu �jungtas"
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 #, fuzzy
 msgid "Internet connection sharing configuration"
 msgstr "Interneto jungtis ir nustatymas"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, fuzzy, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7232,87 +7806,86 @@ msgid ""
 "Click on Configure to launch the setup wizard."
 msgstr "Interneto jungties dalinimas"
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Tinklo konfig�ravimas (%d adapteris)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
 msgstr "Profailas: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "I�trinti profail�..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Profailas i�trynimui:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Naujas profailas..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Kuriamo profailo vardas:"
+#: ../../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 "Kompiuterio vardas:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Pri�jimas prie Interneto"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tipas: "
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "�liuzas (Gateway):"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "Interfeisas:"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
 msgstr "B�sena:"
 
-#: ../../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 "Sujungimas..."
 
-#: ../../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 "Nepajungtas"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Sujungimas..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 #, fuzzy
 msgid "Disconnect..."
 msgstr "Sujungimas..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 #, fuzzy
 msgid "Starting your connection..."
 msgstr "I�bandoma jungtis..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 #, fuzzy
 msgid "Closing your connection..."
 msgstr "I�bandoma jungtis..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7320,124 +7893,118 @@ msgid ""
 "in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 #, fuzzy
 msgid "The system is now disconnected."
 msgstr "Sistema dabar prijungta prie interneto."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Nustatyti Pri�jim� prie Internet..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "LAN konfiguravimas"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adapteris"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Tvarkykl�"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interfeisas"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 #, fuzzy
 msgid "Protocol"
 msgstr "Protokolas"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "B�sena:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Nustatyti Vietin� Tinkl�..."
 
-#: ../../standalone/draknet_.c:283
-#, fuzzy
-msgid "Normal Mode"
-msgstr "Normali"
+#: ../../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 "Nustatym� tikrinimas"
 
-#: ../../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 Konfiguravimas"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapteris %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "�krovos Protokolas"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Startavo �krovos metu"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "DHCP klientas"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "I�jungti"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Aktyvus"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "�jungti"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Aktyvus"
 
-#: ../../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 "Interneto jungties konfiguravimas"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Interneto Jungties Konfiguravimas"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Jungties tipas: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parametrai"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Tiek�jo DNS 1 (pasirinktinai)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Tiek�jo DNS 2 (pasirinktinai)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Ethernet Korta"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP klientas"
 
@@ -7506,16 +8073,31 @@ msgstr ""
 "Dabar naudojami 4 lygio privalumai,bet sistema yra visi�kai u�daryta.\n"
 "Saugumo savyb�s yra maksimalios."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Nustatomas saugumo lygis"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Pasirink serverio nuostatas"
+
+#: ../../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 "Nustatomas saugumo lygis"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 #, fuzzy
 msgid "Control Center"
 msgstr "Prisijungti prie interneto"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Pasirink kur� �rank� nor�tum naudoti"
 
@@ -7544,90 +8126,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "nepavyko paleisti gyvo atnaujinimo!!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "serial_usb nerasta\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Ar emuliuoti tre�i� klavi��?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Pra�om i�bandyti pel�"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-#, fuzzy
-msgid "Network Monitoring"
-msgstr "Tinklo konfig�ravimas"
-
-#: ../../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 "Pel�"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Connecting to Internet "
-msgstr "Prisijungti prie interneto"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Disconnecting from Internet "
-msgstr "Atsijungti nuo interneto"
-
-#: ../../standalone/net_monitor_.c:114
-#, fuzzy
-msgid "Disconnection from Internet failed."
-msgstr "Atsijungti nuo interneto"
-
-#: ../../standalone/net_monitor_.c:115
-#, fuzzy
-msgid "Disconnection from Internet complete."
-msgstr "Atsijungti nuo interneto"
-
-#: ../../standalone/net_monitor_.c:117
-#, fuzzy
-msgid "Connection complete."
-msgstr "Jungties pavadinimas"
-
-#: ../../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 "Sujungimas..."
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Disconnect"
-msgstr "Sujungimas..."
-
 #: ../../standalone/tinyfirewall_.c:29
 #, fuzzy
 msgid "Firewalling Configuration"
@@ -7653,16 +8159,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 "Pasirink savo kalb�"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Parink �diegimo klas�"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Kieto disko nustatymas"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Pel�s nustatymas"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Pasirink klaviat�r�"
+
+#: ../../steps.pm_.c:19
+#, fuzzy
+msgid "Security"
+msgstr "curly"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Nustatyti byl� sistemas"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Su�ym�ti skirsnius"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Pasirinkti paketus"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "�diegti sistem�"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Prid�ti vartotoj�"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Nustatyti tinkl�"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Nustatyti servisus"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Sukurti �krovos diskel�"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "�diegti �krovos tvarkykl�"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Nustatyti X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "I�eiti i� �diegimo"
+
+#: ../../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"
@@ -7673,7 +8248,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"
@@ -7681,7 +8256,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"
@@ -7689,7 +8264,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"
@@ -7698,7 +8273,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"
@@ -7706,7 +8281,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"
@@ -7714,7 +8289,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"
@@ -7722,7 +8297,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"
@@ -7730,7 +8305,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"
@@ -7738,7 +8313,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"
@@ -7747,7 +8322,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"
@@ -7755,24 +8330,40 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, fuzzy, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Adapteris %s: %s"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, fuzzy, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Klaida atidarant %s �ra�ymui: %s"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+msgid "Web/FTP"
+msgstr "Serveris, Tinklapi�/FTP"
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Development"
-msgstr "K�rimo, Tinklapi�"
+msgid "Network Computer (client)"
+msgstr "Tinklo Kompiuteris, X klientas"
+
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+#: ../../share/compssUsers:999
+msgid "Office"
+msgstr "Biuras"
+
+#: ../../share/compssUsers:999
+msgid "Gnome Workstation"
+msgstr "Gnome darbo stotis"
+
+#: ../../share/compssUsers:999
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "�rankiai tavo Palm Pilot arba Visor"
 
 #: ../../share/compssUsers:999
 #, fuzzy
@@ -7784,138 +8375,137 @@ msgid "Firewall/Router"
 msgstr "Serveris, Firewall/Routeris"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Asmenin�s informacijos tvarkykl� (PIM)"
-
-#: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedija - grafika"
-
-#: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internetas"
+msgid "Domain Name and Network Information Server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer (client)"
-msgstr "Tinklo Kompiuteris, X klientas"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Biuro programos: tekst� redaktoriai (kword, abiword), skai�iuokl�s (kspread, "
+"gnumeric), pdf per�i�ros programos ir pan."
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr "Su garsu susij� �rankiai: mp3 ir midi grotuvai, mik�eriai ir pan."
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Interneto stotis"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knygos ir HOWTO apie Linux ir Free Software"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Biuras"
+msgid "KDE Workstation"
+msgstr "KDE darbo stotis"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedija stotis"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "IceWM, Window Maker, Enlightenment, Fvwm ir pan."
 
 #: ../../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 "Multimedija - Vaizdas"
+
+#: ../../share/compssUsers:999
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
-"Rinkinys �ranki� skaityti ir si�sti pa�t� bei naujienas (pine, mutt, tin) ir "
-"nar�yti �iniatinkl� (WWW)"
+"�ranki� rinkinys pa�tui, naujienoms, �iniatinkliui, byl� siuntimui ir "
+"pokalbiams"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C bei C++ k�rimo bibliotekos, programos ir include bylos"
+msgid "Database"
+msgstr "Serveris, Duomen� bazi�"
 
 #: ../../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 "Programos, skirtos tvarkyti tavo finansus, pvz. gnucash"
+#, fuzzy
+msgid "Tools to ease the configuration of your computer"
+msgstr "Ar tu nori i�bandyti nustatymus?"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "Multimedia - Sound"
+msgstr "Multimedija - Garsas"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+msgid "Utilities"
+msgstr "Priemon�s"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "Dokumentacija"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "IceWM, Window Maker, Enlightenment, Fvwm ir pan."
+msgid "Console Tools"
+msgstr "Konsol�s �rankiai"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Priemon�s"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr ""
+msgid "Internet station"
+msgstr "Interneto stotis"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr ""
+msgid "Multimedia station"
+msgstr "Multimedija stotis"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedija - Garsas"
+#, fuzzy
+msgid "Configuration"
+msgstr "LAN Konfiguravimas"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
-"Programos pasilinksminimui: lentos, strateginiai, kort� �aidimai ir pan."
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Daugiau grafini� darbalauki� (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Vaizdo grotuvai ir redaktoriai"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"The K Desktop Environment, pagrindin� grafin� aplinka su dideliu rinkiniu "
+"pritaikyt� program�"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsol�s �rankiai"
+msgid "Graphical Environment"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Garso ir vaizdo grojimo/redagavimo programos"
+#, fuzzy
+msgid "Development"
+msgstr "K�rimo, Tinklapi�"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Mokslin�s darbo stotis"
+msgid "Apache, Pro-ftpd"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Redaktoriai, shell'ai, byl� �rankiai, terminalai"
+msgid "Tools to create and burn CD's"
+msgstr "�rankiai kurti ir kepti CD"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knygos ir HOWTO apie Linux ir Free Software"
+msgid "Office Workstation"
+msgstr "Biuro darbo stotis"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Grafin� aplinka su vartotojui draugi�k� program� ir darbalaukio �ranki� "
-"rinkiniu"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm ir Pan."
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafikos programos, tokios kaip The GIMP"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "�aidimai"
+msgid "DNS/NIS "
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedija - Vaizdas"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C bei C++ k�rimo bibliotekos, programos ir include bylos"
 
 #: ../../share/compssUsers:999
 #, fuzzy
@@ -7923,131 +8513,1333 @@ msgid "Network Computer server"
 msgstr "Serveris, Tinklo Kompiuterio serveris"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafikos programos, tokios kaip The GIMP"
+msgid "Mail/Groupware/News"
+msgstr "Serveris, Pa�to/Grupinio darbo/Naujien�"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Biuro darbo stotis"
+msgid "Game station"
+msgstr "�aidim� stotis"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"The K Desktop Environment, pagrindin� grafin� aplinka su dideliu rinkiniu "
-"pritaikyt� program�"
+msgid "Video players and editors"
+msgstr "Vaizdo grotuvai ir redaktoriai"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Daugiau grafini� darbalauki� (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multimedija - grafika"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "�rankiai kurti ir kepti CD"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+"Programos pasilinksminimui: lentos, strateginiai, kort� �aidimai ir pan."
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedija - CD kepimas"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Rinkinys �ranki� skaityti ir si�sti pa�t� bei naujienas (pine, mutt, tin) ir "
+"nar�yti �iniatinkl� (WWW)"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
 msgstr "Archyvavimas, emuliatoriai, steb�jimas"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Serveris, Duomen� bazi�"
+msgid "Personal Finance"
+msgstr "Asmeniniai finansai"
 
 #: ../../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 ""
-"Biuro programos: tekst� redaktoriai (kword, abiword), skai�iuokl�s (kspread, "
-"gnumeric), pdf per�i�ros programos ir pan."
+"Grafin� aplinka su vartotojui draugi�k� program� ir darbalaukio �ranki� "
+"rinkiniu"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Serveris, Tinklapi�/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr ""
 
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Server"
-msgstr "serveris"
+msgid "Internet gateway"
+msgstr "Pri�jimas prie Interneto"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Asmeniniai finansai"
+msgid "Sound and video playing/editing programs"
+msgstr "Garso ir vaizdo grojimo/redagavimo programos"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Nustatymai"
+msgid "Other Graphical Desktops"
+msgstr "Kiti grafiniai darbalaukiai"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE darbo stotis"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redaktoriai, shell'ai, byl� �rankiai, terminalai"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Kiti grafiniai darbalaukiai"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programos, skirtos tvarkyti tavo finansus, pvz. gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
+msgid "Games"
+msgstr "�aidimai"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Serveris, Pa�to/Grupinio darbo/Naujien�"
+msgid "Personal Information Management"
+msgstr "Asmenin�s informacijos tvarkykl� (PIM)"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome darbo stotis"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedija - CD kepimas"
 
 #: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+msgstr "Mokslin�s darbo stotis"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "negaliu atidaryti /etc/sysconfig/autologin skaitymui: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Ar tu nori i� naujo paleisti tinkl�"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Ar tu sutinki?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Ruo�iamasi i� naujo paleisti tinklo �rengin�:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Ruo�iamasi i� naujo �jungti tinklo �rengin� %s. Ar tu sutinki?"
+
 #, fuzzy
-msgid "Internet gateway"
-msgstr "Pri�jimas prie Interneto"
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "Nebent tu tiksliai �inai kit� variant�, �prastas pasirinkimas b�na \"/dev/"
+#~ "hda\"\n"
+#~ "(tai yra pirminis pagrindinis IDE kaupiklis) arba \"/dev/sda\" (pirmas "
+#~ "SCSI diskas)."
 
-#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "�rankiai tavo Palm Pilot arba Visor"
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "�ia yra �ios spausdinimo eil�s.\n"
+#~ "Tu gali �ia prid�ti daugiau arba pakeisti esamas."
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "�aidim� stotis"
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Jungties tipas: "
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm ir Pan."
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Pasirink �prast� vartotoj�:"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "Ar tu nori i�bandyti nustatymus?"
+#~ msgid "Test the mouse here."
+#~ msgstr "Pra�om i�bandyti pel�"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"�ranki� rinkinys pa�tui, naujienoms, �iniatinkliui, byl� siuntimui ir "
-"pokalbiams"
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr "Pasirink norim� kalb� �diegimui ir sistemos vartojimui"
+
+#~ 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 ""
+#~ "Tu turi sutikti su auk��iau esan�ios licenzijos s�lygomis, kad t�stum "
+#~ "�diegim�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Pra�om spausti �Sutinku�, jei sutinki su jos s�lygomis.\n"
+#~ "\n"
+#~ "\n"
+#~ "Pra�om spausti �Atmetu�, jei nesutinki su jos s�lygomis.\n"
+#~ "�diegimas bus nutrauktas, nekei�iant esamos konfig�racijos."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Pasirink norim� klaviat�ros i�d�stym� i� s�ra�o auk��iau"
+
+#~ 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 ""
+#~ "Jei nori, kad kitos kalbos (be tos, kuri� nurodei �diegimo prad�ioje)\n"
+#~ "b�t� prieinamos �diegus sistem�, pasirink jas i� auk��iau esan�io\n"
+#~ "s�ra�o. Jei nori vis�, tiesiog spausk �Visos�."
+
+#~ 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 ""
+#~ "Pasirink:\n"
+#~ "\n"
+#~ "  - Prisitaikyta: Jeigu esi pakankamai pa��stamas su GNU/Linux, gal�si "
+#~ "pasirinkti pagrindin� sistemos paskirt�. �i�r�k �emiau d�l smulkmen�.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Eksperto: Jeigu tau puikiai sekasi su GNU/Linux, ir nori smarkiai "
+#~ "prisitaikyti \n"
+#~ "    �diegim�. Kaip ir �Prisitaikytoje� klas�je, tu gal�si pasirinkti "
+#~ "pagrindin� \n"
+#~ "    sistemos paskirt�. Bet, labai pra�au, NESIRINK �ITO, NEBENT TIKRAI "
+#~ "�INAI, K� DARAI!"
+
+#~ 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 ""
+#~ "Tu turi apibr��ti, kam ma�ina bus naudojama. Pasirinkimai yra:\n"
+#~ "\n"
+#~ "* Darbo stotis: tai geriausias pasirinkimas, jei ruo�iesi ma�in� naudoti "
+#~ "daugiausiai kasdieniams darbams,\n"
+#~ "  �staigoje ar namie.\n"
+#~ "\n"
+#~ "\n"
+#~ "* K�rimo: jei ruo�iesi �i� ma�in� naudoti daugiausiai programin�s �rangos "
+#~ "k�rimui, tai geras pasirinkimas. Tu\n"
+#~ "  tada tur�si �diegt� piln� rinkin� program�, skirt� kompiliuoti, derinti "
+#~ "ir formatuoti i�eities tekstus, bei kurti\n"
+#~ "  program� paketus.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Serveris: jei ruo�iesi naudoti �i� ma�in� naudoti kaip server�, tai "
+#~ "geras pasirinkimas. Tiek byl� server�\n"
+#~ "  (NFS arba SMB), tiek spausdinimo server� (Unix ar Microsoft Windows "
+#~ "stiliaus), autentikacijos (NIS),\n"
+#~ "  duomen� baz�s server� ir pan. Jei taip, nesitik�k, kad bus �diegti "
+#~ "visokie gra�umai (KDE, 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 ""
+#~ "Tu dabar gali pasirinkti grup� paket�, kuriuos nori �diegti\n"
+#~ "ar atnaujinti.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX tada patikrins, ar yra pakankamai vietos �diegti juos visus. Jei "
+#~ "ne,\n"
+#~ "persp�s tave apie tai. Jei vis tiek nor�si t�sti, pasirinkt� grupi� "
+#~ "�diegimas\n"
+#~ "bus prat�stas, ta�iau kai kurie ma�iau naudingi paketai bus i�mesti. "
+#~ "S�ra�o\n"
+#~ "pabaigoje tu gali pasirinkti variant� \"Atskir� paket� pasirinkimas\", "
+#~ "tuo atveju\n"
+#~ "tu gal�si nar�yti po daugiau nei 1000 paket� ir pasirinkti juos po "
+#~ "vien�..."
+
+#~ 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 ""
+#~ "Dabar tu gali pasirinkti po vien� paketus, kuriuos\n"
+#~ "nori �diegti\n"
+#~ "\n"
+#~ "\n"
+#~ "Tu gali i�skleisti ir suskleisti med�, spragtel�damas mygtukus "
+#~ "kairiajame\n"
+#~ "apatiniame paket� lango kampe.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jei labiau nor�tum matyti paketus surikiuotus pagal ab�c�l�, spragtel�k "
+#~ "ant\n"
+#~ "ikonos \"Perjungti tarp rikiavimo pagal grupes ar ab�c�l�\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Jei nenori, kad tave �sp�t� apie priklausomybes, spragtel�k ant\n"
+#~ "\"Tyliai patenkinti priklausomybes\". Jei taip padarysi, nepamir�k, kad "
+#~ "at�ym�jus\n"
+#~ "vien� paket�, gali b�ti at�ym�ti keletas kit�, kurie nuo jo priklauso."
+
+#~ 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 ""
+#~ "Jei turi visus CD i� auk��iau esan�io s�ra�o, spausk Gerai.\n"
+#~ "Jei neturi n� vieno i� �i� CD, spausk Nutraukti.\n"
+#~ "Jei tr�ksta tik kai kuri� CD, at�ym�k juos ir tada spausk Gerai."
+
+#~ 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 ""
+#~ "Jei tu nori prijungti savo kompiuter� prie interneto arba\n"
+#~ "vietinio tinklo, pasirink teising� variant�. Pra�om �jungti �rengin� "
+#~ "prie�\n"
+#~ "pasirenkant teising� variant� -- tai leis DrakX automati�kai j� "
+#~ "atpa�inti.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jei tu neturi galimyb�s prisijungti nei prie interneto, nei prie vietinio "
+#~ "tinklo,\n"
+#~ "rinkis \"I�jungti tinkl�\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Jei nori sutvarkyti tinkl� v�liau, baigus �diegim�, arba jei jau baigei\n"
+#~ "konfig�ruoti savo tinklo jungtis, rinkis \"Atlikta\"."
+
+#~ 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 ""
+#~ "Nebuvo aptiktas joks modemas. Pra�om pasirinkti nuosekl�j� prievad�,\n"
+#~ "prie kurio jis yra prijungtas.\n"
+#~ "\n"
+#~ "�inok, kad pirmasis nuoseklusis prievadas (COM1 MS Windows'uose)\n"
+#~ "vadinamas ttyS0 Linux'e."
+
+#~ 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 ""
+#~ "Tu dabar gali �vesti prisiskambinimo nuostatas. Jei tu\n"
+#~ "ne�inai arba nesi tikras, k� �vesti, teising� informacij� gali gauti i� "
+#~ "savo\n"
+#~ "Interneto paslaug� tiek�jo (IPT). Jei tu ne�vesi DNS (vard� serverio)\n"
+#~ "informacijos �ia, ji bus gauta i� Interneto paslaug� tiek�jo jungimosi "
+#~ "metu."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Jei tavo modemas yra i�orinis, pra�om �jungti j� dabar, kad DrakX gal�t� "
+#~ "atpa�inti j� automati�kai."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Pra�au, �junk savo modem� ir pasirink teising�."
+
+#~ 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 ""
+#~ "Jei tu nesi tikras, ar auk��iau pateikta informacija yra teisinga,\n"
+#~ "arba tiksliai ne�inai, k� �vesti, teising� informacij� gali gauti i� "
+#~ "savo\n"
+#~ "Interneto paslaug� tiek�jo (IPT). Jei tu ne�vesi DNS (vard� serverio)\n"
+#~ "informacijos �ia, ji bus gauta i� Interneto paslaug� tiek�jo jungimosi "
+#~ "metu."
+
+#~ 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 ""
+#~ "Tu dabar gali �vesti savo hosto vard�, jei to reikia. Jei tu\n"
+#~ "ne�inai arba nesi tikras, k� �vesti, teising� informacij� gali gauti i� "
+#~ "savo\n"
+#~ "Interneto paslaug� tiek�jo (IPT)."
+
+#~ 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 ""
+#~ "Tu dabar gali sutvarkyti savo tinklo �rengin�:\n"
+#~ "\n"
+#~ "   * IP adresas: jeigu jo ne�inai, arba nesi tikras k� �vesti, pasiklausk "
+#~ "savo tinklo administratoriaus.\n"
+#~ "     Tu tur�tum ne�vesti IP adreso, jei pasirenki \"Automatinis IP\" "
+#~ "�emiau.\n"
+#~ "\n"
+#~ "   * Netmask: \"255.255.255.0\" da�niausiai yra neblogas pasirinkimas. "
+#~ "Jeigu ne�inai, arba nesi tikras\n"
+#~ "     k� �vesti, pasiklausk savo tinklo administratoriaus.\n"
+#~ "\n"
+#~ "   * Automatinis IP: Jeigu tavo tinkle naudojamas BOOTP ar DHCP "
+#~ "protokolas, pasirink �� variant�.\n"
+#~ "     Jeigu pasirinksi j�, nereik�s nieko �ra�yti prie \"IP adreso\". "
+#~ "Jeigu tu ne�inai, arba nesi tikras, ar reikia\n"
+#~ "     pasirinkti �� variant�, pasiklausk tinklo administratoriaus."
+
+#~ 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 ""
+#~ "Tu dabar gali �vesti savo hosto vard�. Jeigu jo ne�inai,\n"
+#~ "arba nesi tikras k� �vesti, pasiklausk savo tinklo administratoriaus."
+
+#~ 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 ""
+#~ "Tu dabar gali �vesti savo hosto vard�, jei to reikia. Jei tu ne�inai\n"
+#~ "arba nesi tikras, k� �vesti, palik tu��ia."
+
+#~ 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 ""
+#~ "Dabar tu gali �vesti prisiskambinimo nuostatas. Jeigu tu gerai ne�inai,\n"
+#~ "k� �ra�yti, teising� informacij� gali gauti i� savo 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 ""
+#~ "Jeigu tu naudosi proxy, pra�om dabar juos nustatyti. Jeigu tu dar "
+#~ "ne�inai,\n"
+#~ "ar tur�tum naudoti proxy, pasiklausk tinklo administratoriaus arba ISP."
+
+#~ 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 ""
+#~ "Dabar tu gali �diegti kriptografijos paket�, jeigu tavo interneto juntis "
+#~ "buvo\n"
+#~ "gerai sutvarkyta. Prad�iai pasirink atvaizd� (mirror), i� kurio parsi�sti "
+#~ "paketus,\n"
+#~ "o po to pa�ym�k, kuriuos paketus �diegti.\n"
+#~ "\n"
+#~ "Atmink, kad tu turi pasirinkti atvaizd� ir kriptografijos paketus, "
+#~ "atitinkan�ius\n"
+#~ "�statym� reikalavimus."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr ""
+#~ "Tu dabar gali pasirinkti laiko juost�, priklausomai nuo to, kur gyveni."
+
+#~ 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 ""
+#~ "Tu gali sukonfig�ruoti vietin� spausdintuv� (prijungt� prie tavo "
+#~ "kompiuterio) arba\n"
+#~ "nutolus� spausdintuv� (prieinam� per Unix, Netware arba Microsoft Windows "
+#~ "tinkl�)"
+
+#~ 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 ""
+#~ "jei tu nori spausdinimo galimyb�s, pra�om dabar pasirinkti vien� "
+#~ "spausdinimo\n"
+#~ "sistem� i� CUPS ir LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS yra nauja, galinga ir lanksti spausdinimo sistema Unix sistemoms "
+#~ "(CUPS\n"
+#~ "rei�kia \"Common Unix Printing System\"). Tai yra spausdinimo sistema,\n"
+#~ "Mandrake Linux parenkama pagal nutyl�jim�.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR yra sena spausdinimo sistema, naudota ankstesn�se Mandrake Linux\n"
+#~ "versijose.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jei tu neturi spausdintuvo, pasirink \"Jokia\"."
+
+#~ 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 gali susitvarkyti su dauguma spausdintuv� tip�. Kiekvienas i�\n"
+#~ "�i� tip� reikalauja skirtingo nustatymo.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jei tavo spausdintuvas yra fizi�kai prijungtas prie tavo kompiuterio,\n"
+#~ "pasirink \"Vietinis spausdintuvas\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Jei nori prieiti prie spausdintuvo, kuris yra nutolusioje Unix "
+#~ "sistemoje,\n"
+#~ "pasirink \"Nutol�s spausdintuvas\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Jei nori prieiti prie spausdintuvo, kuris yra nutolusiame Microsoft "
+#~ "Windows\n"
+#~ "kompiuteryje (arba Unix kompiuteryje, naudojan�iame SMB protokol�), "
+#~ "pasirink\n"
+#~ "\"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 ""
+#~ "Pra�au, �junk savo spausdintuv� prie� leisdamas DrakX j� atpa�inti.\n"
+#~ "\n"
+#~ "Tu dabar turi �vesti �iek tiek informacijos.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Spausdintuvo vardas: spausdinimo kaupykla (spooler) naudoja \"lp\" "
+#~ "kaip �prast� spausdintuvo vard�. Taigi,\n"
+#~ "     tu turi tur�ti spausdintuv�, pavadint� \"lp\". Jei turi tik vien� "
+#~ "spausdintuv�, gali jam parinkti kelet� vard�. Tu \n"
+#~ "     tiesiog turi atskirti juos sta�iu br�k�niu (\"|\"). Taigi, jei "
+#~ "patikt� prasmingesnis vardas, tu turi j� �ra�yti pirm�,\n"
+#~ "     pvz. \"Mano spausdintuvas|lp\". Spausdintuvas, kurio varde yra \"lp"
+#~ "\", bus parenkamas pagal nutyl�jim�.\n"
+#~ "\n"
+#~ "\n"
+#~ "  � * Apra�ymas: jis neb�tinas, bet gali b�ti naudingas, jei prie "
+#~ "kompiuterio yra prijungti keli spausdintuvai arba\n"
+#~ "     leid�iama kitiems kompiuteriams prieiti prie �io spausdintuvo.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Vieta: jei nori �ra�yti �iek tiek informacijos apie tai, kur tas "
+#~ "spausdintuvas yra, �ra�yk j� �ia (gali ra�yt\n"
+#~ "     k� tik nori, pavyzd�iui \"ant boso stalo\").\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 ""
+#~ "Tu dabar turi �vesti �iek tiek informacijos.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Spausdintuvo vardas: spausdinimo kaupykla (spooler) naudoja \"lp\" "
+#~ "kaip �prast� spausdintuvo vard�.\n"
+#~ "     Taigi, tu turi tur�ti spausdintuv�, pavadint� \"lp\". Jei turi tik "
+#~ "vien� spausdintuv�, gali jam parinkti kelet�\n"
+#~ "     vard�. Tu tiesiog turi atskirti juos sta�iu br�k�niu (\"|\"). Taigi, "
+#~ "jei patikt� prasmingesnis vardas, tu turi j�\n"
+#~ "     �ra�yti pirm�, pvz. \"Mano spausdintuvas|lp\". Spausdintuvas, kurio "
+#~ "varde yra \"lp\", bus parenkamas\n"
+#~ "     pagal nutyl�jim�.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Kaupimo (spool) katalogas: tai katalogas, � kur� �ra�omi spausdinimo "
+#~ "darbai. Palik �prast� parinkt�,\n"
+#~ "     jeigu ne�inai k� naudoti.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Spausdintuvo jungtis: jei tavo spausdintuvas yra fizi�kai prijungtas "
+#~ "prie tavo kompiuterio, rinkis\n"
+#~ "     \"Vietinis spausdintuvas\". Jie nori prieiti prie spausdintuvo, "
+#~ "prijungto prie nutolusio Unix kompiuterio,\n"
+#~ "     pasirink \"Nutol�s lpd spausdintuvas\".\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "     Jei nori prieiti prie spausdintuvo, kuris yra nutolusiame Microsoft "
+#~ "Windows kompiuteryje (arba\n"
+#~ "     Unix kompiuteryje, naudojan�iame SMB protokol�), pasirink \"SMB/"
+#~ "Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Jie nori prieiti prie spausdintuvo, esan�io Netware tinkle, pasirink "
+#~ "\"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 ""
+#~ "Tavo spausdintuvas nebuvo atpa�intas. Pra�om �vesti pavadinim� "
+#~ "�renginio,\n"
+#~ "prie kurio jis yra prijungtas.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tavo �iniai, dauguma spausdintuv� b�na prijungti prie pirmos "
+#~ "lygiagre�iosios jungties.\n"
+#~ "Tai vadinama \"/dev/lp0\" GNU/Linux sistemose, ir \"LPT1\" Microsoft "
+#~ "Windows."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Tu dabar turi pasirinkti savo spausdintuv� i� s�ra�o auk��iau."
+
+#~ 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 ""
+#~ "Pra�om pasirinkti teisingas nuostatas, priklausomai nuo spausdintuvo.\n"
+#~ "Pasi�i�r�k � dokumentacij�, jeigu ne�inai, k� �ia �vesti.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tu gal�si i�bandyti nustatymus sekan�iame �ingsnyje, ir sugr���s v�l juos "
+#~ "pakeisti,\n"
+#~ "jeigu neveikia taip, kaip tu nor�tum."
+
+#~ 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 ""
+#~ "Dabar tu gali �vesti savo Mandrake Linux sistemos root slapta�od�.\n"
+#~ "Slapta�odis turi b�ti �vestas du kartus patikrinimui, kad abu �ra�ai "
+#~ "sutampa.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root yra sistemos administratorius ir vienintelis vartotojas, kuriam "
+#~ "leid�iama\n"
+#~ "konfig�ruoti sistem�. Taigi, slapta�od� pasirink atsargiai. Neteis�tas "
+#~ "root\n"
+#~ "vartojimas gali b�ti ypatingai pavojingas �iai sistemai, duomenims joje "
+#~ "ir kitoms,\n"
+#~ " su ja susijusioms sistemoms.\n"
+#~ "\n"
+#~ "\n"
+#~ "Slapta�odis turi b�ti raid�i� ir skai�i� mi�inys, ma�iausiai 8 simboli�\n"
+#~ "ilgio. Jis tur�t� niekada neb�ti u�ra�ytas ant popieriaus.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nepasidaryk slapta�od�io pernelyg ilgo ir sud�tingo: tu tur�tum j� "
+#~ "prisiminti\n"
+#~ "be ypating� pastang�."
+
+#~ 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 ""
+#~ "Dabar tu gali sukurti vien� arba daugiau \"paprast�\" vartotoj�.\n"
+#~ "Kiekvienam �mogui, kuriam tu nori leisti naudotis �iuo kompiuteriu,\n"
+#~ "tu gali sukurti vien� ar daugiau s�skait� (account). Atmink, kad\n"
+#~ "kiekvienas vartotojas tur�s savus nustatymus (grafin�s aplinkos,\n"
+#~ "program� nuostatas, ir t.t. ), bei savo \"nam� katalog�\", kuriame\n"
+#~ "tie nustatymai bus laikomi.\n"
+#~ "\n"
+#~ "\n"
+#~ "Pirmiausia, sukurk vartotoj� sau pa�iam! Net jeigu tu b�si vienintelis "
+#~ "�io\n"
+#~ "kompiuterio vartotojas, tu NEGALI prisijungti kaip root vartotojas "
+#~ "sistemos\n"
+#~ "kasdieniam naudojimui: taip i�kilt� didel� saugumo gr�sm�. Kad padarytum\n"
+#~ "sistem� nebe�manom� naudoti, u�tenka padaryti por� klaid�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tod�l, tu tur�tum prisijungti prie sistemos, naudodamasis vartotojo "
+#~ "s�skaita,\n"
+#~ "kuri� b�si �ia suk�r�s, o pasisveikinti kaip root tik administravimo ar\n"
+#~ "prie�i�ros darbams."
+
+#~ 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 ""
+#~ "Sukurti �krovos diskel� labai rekomenduojama. Jei tau nepavykt�\n"
+#~ "�krauti kompiuterio, tai vienintelis b�das i�gelb�ti sistem� jos\n"
+#~ "nediegiant i� naujo."
+
+#, 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 ""
+#~ "Pagrindin�s LILO bei GRUB nuostatos yra �ios:\n"
+#~ "  - �krovos �renginys: Nurodo �rengin� (pvz. disko skirsn�), kuriame\n"
+#~ "yra �krovos sektorius. Pasirink \"/dev/hda\", nebent �inai tiksliai "
+#~ "kitaip.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Pauz� prie� �keliant �prast� atvaizd� (image): Nurodo de�imt�j�\n"
+#~ "sekund�s dali� kiek�, kiek reikia palaukti, prie� paleid�iant pirm� "
+#~ "atvaizd�.\n"
+#~ "Tai naudinga sistemoms, kurios kraunasi i�kart po klaviat�ros �jungimo.\n"
+#~ "�krovos tvarkykl� nelaukia, jeigu \"pauz�\" yra nenurodyta arba lygi "
+#~ "nuliui.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Vaizdo re�imas: Tai nurodo  VGA re�im�, pasirenkam� paleid�iant.\n"
+#~ "Yra galimos �ios reik�m�s:\n"
+#~ "\n"
+#~ "    * normal: pasirinkti standartin� 80x25 tekstin� re�im�.\n"
+#~ "\n"
+#~ "    * <skai�ius>: naudoti atitinkam� tekstin� re�im�."
+
+#~ 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 yra �krovos tvarkykl� SPARC'ams: ji gali �krauti\n"
+#~ "tiek GNU/Linux, tiek bet koki� kit� operacij� sistem�, esan�i�\n"
+#~ "kompiuteryje. Paprastai tos kitos operacij� sistemos yra teisingai\n"
+#~ "atpa��stamos ir �diegiamos. Jeigu ne, tu gali prid�ti �ra�us pats �iame\n"
+#~ "lange. B�k atidus ir pasirink teisingus parametrus.\n"
+#~ "\n"
+#~ "\n"
+#~ "Tu taip pat gali u�drausti pri�jim� prie t� kit� operacij� sistem�\n"
+#~ "bet kam, jei i�trinsi atitinkamus �ra�us. Bet tuo atveju, tau prireiks\n"
+#~ "�krovos diskelio, kad jas �krautum!"
+
+#~ 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 ""
+#~ "Pagrindin�s SILO nuostatos yra �ios:\n"
+#~ "  - �krovos tvarkykl�s �diegimas: Parodo, kur tu nori pad�ti "
+#~ "informacij�,\n"
+#~ "reikaling� �krauti GNU/Linux. Pasirink \"Pirmasis kaupiklio sektorius "
+#~ "(MBR)\",\n"
+#~ "nebent �inai tiksliai kitaip.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Pauz� prie� �keliant �prast� atvaizd� (image): Nurodo de�imt�j�\n"
+#~ "sekund�s dali� kiek�, kiek reikia palaukti, prie� paleid�iant pirm� "
+#~ "atvaizd�.\n"
+#~ "Tai naudinga sistemoms, kurios kraunasi i�kart po klaviat�ros �jungimo.\n"
+#~ "�krovos tvarkykl� nelaukia, jeigu \"pauz�\" yra nenurodyta arba lygi "
+#~ "nuliui."
+
+#~ 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 ""
+#~ "At�jo laikas sukonfig�ruoti X Window sistem�, kuri yra GNU/Linux GUI\n"
+#~ "(Grafin�s vartotojo s�sajos) pagrindas. Kad tai padarytum, tau\n"
+#~ "reikia sukonfig�ruoti vaizdo plok�t� bei monitori�. Dauguma �ingsni�\n"
+#~ "yra automatizuoti, ir tavo darbas gal b�t bus tik patikrinti, kas buvo\n"
+#~ "atlikta, ir pritarti nuostatoms :)\n"
+#~ "\n"
+#~ "\n"
+#~ "Kai konfig�ravimas bus baigtas, bus paleisti X'ai (nebent papra�ysi\n"
+#~ "DrakX, kad to nedaryt�) tam, kad gal�tum patikrinti ir pamatytum,\n"
+#~ "ar nuostatos tau tinka. Jeigu ne, tu gali sugr��ti ir pakeisti jas,\n"
+#~ "tiek kart�, kiek reik�s."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Jeigu kas nors su X konfig�racija yra netvarkoje, naudok �ias parinktis\n"
+#~ "teisingai nustatyti X Window sistemai."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Jeigu tu nori pasisveikinti grafiniam re�ime, pasirink \"Taip\".\n"
+#~ "Kitu atveju rinkis \"Ne\"."
+
+#~ 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 ""
+#~ "Tavo sistem� ruo�iamasi perkrauti.\n"
+#~ "\n"
+#~ "Po perkrovimo tavo naujoji Mandrake Linux sistema bus �krauta\n"
+#~ "automati�kai. Jeigu nori pakrauti kit� operacij� sistem�, pra�om\n"
+#~ "perskaityti papildomas instrukcijas."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "�ek� (Programuotojo)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slovak� (Programuotojo)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Kuriamo profailo vardas:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "�ra�yti /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Atstatyti i� bylos"
+
+#~ msgid "Save in file"
+#~ msgstr "I�saugoti � byl�"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Atstatyti i� diskelio"
+
+#~ msgid "Format all"
+#~ msgstr "Su�ym�ti visus skirsnius"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Su�ym�jus visus skirsnius,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "visi duomenys, esantys �iuose skirsniuose, bus prarasti"
+
+#~ msgid "Reload"
+#~ msgstr "V�l �kelti"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr "Ar tu nori sukurti automatinio �diegimo diskel� Linux dauginimui?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL nustatymas"
+
+#~ 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 ""
+#~ "Su nutolusiu CUPS serveriu, tau �ioje vietoje nereikia nustatin�ti\n"
+#~ "joki� spausdintuv�; jie bus automati�kai atpa��stami,\n"
+#~ "nebent tu turi server�, kuris yra kitame tinkle; tuomet turi �ra�yti\n"
+#~ "CUPS serverio IP adres� ir galb�t  prievado numer�."
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid "Remote queue"
+#~ msgstr "Nutolusi eil�"
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Nutolusi eil�"
+
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "Domeno vardas"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Spausdintuvo n�ra"
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "grie�ta"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minut�s"
+#, fuzzy
+#~ msgid "Network Monitoring"
+#~ msgstr "Tinklo konfig�ravimas"
 
-#~ msgid "1 minute"
-#~ msgstr "1 minut�"
+#~ msgid "Profile "
+#~ msgstr "Profailas "
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sekund�s"
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "Jungties tipas: "
+
+#, fuzzy
+#~ msgid "Connecting to Internet "
+#~ msgstr "Prisijungti prie interneto"
+
+#, fuzzy
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Atsijungti nuo interneto"
+
+#, fuzzy
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Atsijungti nuo interneto"
+
+#, fuzzy
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Atsijungti nuo interneto"
+
+#, fuzzy
+#~ msgid "Connection complete."
+#~ msgstr "Jungties pavadinimas"
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "Nustatymai"
+
+#, fuzzy
+#~ msgid "average"
+#~ msgstr "i�kraipymai"
+
+#, fuzzy
+#~ msgid "Connect"
+#~ msgstr "Sujungimas..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Sujungimas..."
+
+#~ msgid "/File/_New"
+#~ msgstr "/Byla/_Nauja"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Byla/Atidaryti"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Byla/U�ra�yti"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Byla/U�ra�yti Kaip"
+
+#~ msgid "/File/-"
+#~ msgstr "/Byla/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/Pasirinktys"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Pasirinkys/Bandymas"
+
+#~ msgid "/_Help"
+#~ msgstr "/Pagalba"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Pagalba/_Apie..."
+
+#, fuzzy
+#~ msgid "Default Runlevel"
+#~ msgstr "�prastas"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Pa�alinti eil�"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Nuostat� bylos turinio nepavyko suprasti."
+
+#~ msgid "Adapter"
+#~ msgstr "Adapteris"
+
+#~ msgid "Disable network"
+#~ msgstr "U�drausti tinkl�"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "U�drausti tinkl�"
+
+#~ 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 ""
+#~ "Tu dabar gali i�bandyti savo pel�. Naudok klavi�us ir ratuk�,\n"
+#~ "kad patikrintum ar nuostatos geros. Jei ne, spausk �Nutraukti�\n"
+#~ "ir pasirink kit� tvarkykl�."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (arba ADSL) jungtis"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Pel�"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr ""
+#~ "Tu gali tiesiog �ra�yti URI, kad prieitum prie spausdintuvo su CUPS."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Taip, spausdinti ASCII bandom�j� puslap�"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Taip, spausdinti PostScript bandom�j� puslap�"
+
+#~ msgid "Paper Size"
+#~ msgstr "Lapo dydis"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Ar i�stumti lap� po darbo?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Uniprint tvarkykl�s nuostatos"
+
+#~ msgid "Color depth options"
+#~ msgstr "Spalv� gylio nuostatos"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Spausdinti tekst� kaip PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Taisyti stair-stepping tekst�?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Puslapi� skai�ius vienam i�vesties puslapiui"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Kairysis/De�inysis kra�tai ta�kais (1/72 colio)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Vir�utinis/Apatinis kra�tas ta�kais (1/72 colio)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Papildomos GhostScript nuostatos"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Papildomos teksto nuostatos"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Atbulin� puslapi� seka"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS paleid�iamas"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Pasirink nutolusio spausdintuvo jungt�"
+
+#~ 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 ""
+#~ "Kiekviena spausdinimo eil� turi tur�ti pavadinim� (pavyzd�iui, lp).\n"
+#~ "Gali b�ti nurodyti kiti parametrai, tokie kaip spausdintuvo apra�ymas\n"
+#~ "ar jo vieta. Koks �io spausdintuvo vardas ir kaip jis yra prijungtas?"
+
+#~ 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 ""
+#~ "Kiekviena spausdinimo eil� (� kuri� nukreipiami spaudiniai) turi tur�ti\n"
+#~ "pavadinim� (da�niausiai lp) ir kaupimo katalog�, susiet� su ja. Koks "
+#~ "pavadinimas\n"
+#~ "bei katalogas tur�t� b�ti naudojami �iai eilei, ir kaip yra prijungtas "
+#~ "spausdintuvas?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Eil�s pavadinimas"
+
+#~ msgid "Spool directory"
+#~ msgstr "Kaupimo katalogas"
+
+#~ msgid "Disable"
+#~ msgstr "I�jungti"
+
+#~ msgid "Enable"
+#~ msgstr "�jungti"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Nor�damas padaryti sistem� saugesne, pasirink \"Naudoti �e��lin� byl�\" "
+#~ "ir\n"
+#~ "\"Naudoti MD5 slapta�od�ius\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Jeigu tavo tinklas naudoja NIS, pasirink \"Naudoti NIS\". Jeigu\n"
+#~ "ne�inai, paklausk tinklo administratoriaus."
+
+#~ msgid "yellow pages"
+#~ msgstr "geltonieji puslapiai"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "LAN konfiguravimas"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "Tiek�jo DNS 1"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "Tiek�jo DNS 2"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Kaip tu nori prisijungti prie interneto?"
 
 #, fuzzy
 #~ msgid "Lilo/Grub configuration"
@@ -8065,10 +9857,6 @@ msgstr ""
 #~ msgstr "Konfig�ruojama..."
 
 #, fuzzy
-#~ msgid "Standard tools"
-#~ msgstr "Standartin�"
-
-#, fuzzy
 #~ msgid "Configuration de Lilo/Grub"
 #~ msgstr "Nustatymai: Prid�ti suradimo viet�"
 
@@ -8210,9 +9998,6 @@ msgstr ""
 #~ msgid "Internet/Network access"
 #~ msgstr "Internet/Tinklo pri�jimas"
 
-#~ msgid "Mail information"
-#~ msgstr "Pa�to informacij�"
-
 #, fuzzy
 #~ msgid "Firewall Configuration Wizard"
 #~ msgstr "Tinklo Konfig�ravimo Meistras"
@@ -8301,9 +10086,6 @@ msgstr ""
 #~ "\n"
 #~ "Jeigu t�site a� i�jungsiu j�s� %s aplink�"
 
-#~ msgid "eth$_"
-#~ msgstr "eth$_"
-
 #~ msgid "%s is already in use"
 #~ msgstr "%s jau naudojama"
 
@@ -8386,7 +10168,7 @@ msgstr ""
 
 #~ msgid ""
 #~ "At this point, you need to choose what\n"
-#~ "partition(s) to use to install your new Linux-Mandrake system. If "
+#~ "partition(s) to use to install your new Mandrake Linux system. If "
 #~ "partitions\n"
 #~ "have been already defined (from a previous installation of GNU/Linux or "
 #~ "from\n"
@@ -8465,8 +10247,8 @@ msgstr ""
 #~ "say 50MB, you may find it a useful place to store \n"
 #~ "a spare kernel and ramdisk image for emgergency boot situations."
 #~ msgstr ""
-#~ "Dabar tu turi pasirinkti, kuriuos skirsnius naudoti tavo naujai Linux-"
-#~ "Mandrake \n"
+#~ "Dabar tu turi pasirinkti, kuriuos skirsnius naudoti tavo naujai Mandrake "
+#~ "Linux \n"
 #~ "sistemai �diegti. Jei skirsniai jau buvo apibr��ti (i� praeito �diegimo "
 #~ "arba kitu dalinimo �rankiu),\n"
 #~ "tu gali naudoti esan�ius skirsnius. Kitu atveju, skirsniai turi b�ti "
@@ -8531,11 +10313,11 @@ msgstr ""
 #~ "\n"
 #~ "Kai skirsnis yra parinktas, gali naudoti:\n"
 #~ "\n"
-#~ "\t* Ctrl-c kad sukurtum nauj� skirsn� (jei parinktas tu��ias skirsnis)\n"
+#~ "* Ctrl-c kad sukurtum nauj� skirsn� (jei parinktas tu��ias skirsnis)\n"
 #~ "\n"
-#~ "\t* Ctrl-d kad i�trintum skirsn�.\n"
+#~ "* Ctrl-d kad i�trintum skirsn�.\n"
 #~ "\n"
-#~ "\t* Ctrl-m kad nurodytum prijungim� ta�k�."
+#~ "* Ctrl-m kad nurodytum prijungim� ta�k�."
 
 #~ msgid "Auto install floppy"
 #~ msgstr "Auto �diegimo diskelis"
@@ -8552,9 +10334,6 @@ msgstr ""
 #~ msgid "Bad kickstart file %s (failed %s)"
 #~ msgstr "Bloga kickstart byla %s (nepavyko %s)"
 
-#~ msgid "CHAP"
-#~ msgstr "CHAP"
-
 #~ msgid "Cable connecion"
 #~ msgstr "Kabelin� jungtis"
 
@@ -8575,7 +10354,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"
@@ -8599,8 +10378,8 @@ msgstr ""
 #~ "versij�\n"
 #~ "arba j�s norite tur�ti j� kelet�.\n"
 #~ "\n"
-#~ "Pasirinkite \"I�gelb�ti\" jeigu norite i�gelb�ti jau �diegt� Linux-"
-#~ "Mandrake \n"
+#~ "Pasirinkite \"I�gelb�ti\" jeigu norite i�gelb�ti jau �diegt� Mandrake "
+#~ "Linux \n"
 #~ "\n"
 #~ "\n"
 #~ "Pasirinkite:\n"
@@ -8656,9 +10435,6 @@ msgstr ""
 #~ msgid "Configure local network"
 #~ msgstr "Nustatyti vietin� tinkl�"
 
-#~ msgid "Configure printer"
-#~ msgstr "Nustatyti spausdintuv�"
-
 #~ msgid "Configure the Internet connection / Configure local Network"
 #~ msgstr "Nustatyti interneto jungt� / Nustatyti vietin� tinkl�"
 
@@ -8689,9 +10465,6 @@ msgstr ""
 #~ msgid "Disable Internet Connection"
 #~ msgstr "U�drausti interneto jungt�"
 
-#~ msgid "Disable networking"
-#~ msgstr "U�drausti tinkl�"
-
 #~ msgid ""
 #~ "Do you want to configure a dialup connection with modem for your system?"
 #~ msgstr "Ar J�s norite nustatyti savo modemo dialup prisijungim�?"
@@ -8966,9 +10739,6 @@ msgstr ""
 #~ msgid "Microsoft compatible (serial)"
 #~ msgstr "Suderinama su Microsoft (serijin�)"
 
-#~ msgid "Modem Configuration"
-#~ msgstr "Modemo Nustatymai"
-
 #~ msgid "Move your wheel!"
 #~ msgstr "Pajudinkite ratuk�!"
 
@@ -8987,9 +10757,6 @@ msgstr ""
 #~ msgid "No more match"
 #~ msgstr "Daugiau nieko nerasta"
 
-#~ msgid "No root partition found"
-#~ msgstr "Nerastas pagrindinis skirsnis"
-
 #~ msgid ""
 #~ "No valid modes found\n"
 #~ "Try with another video card or monitor"
@@ -8997,9 +10764,6 @@ msgstr ""
 #~ "Nerasta galim� variant�\n"
 #~ "Pabandykite kit� video plok�t� arba monitori�"
 
-#~ msgid "None"
-#~ msgstr "Jokia"
-
 #~ msgid "Other countries"
 #~ msgstr "Kitos valstyb�s"
 
@@ -9024,9 +10788,6 @@ msgstr ""
 #~ msgid "Regexp"
 #~ msgstr "Regexp"
 
-#~ msgid "Remove"
-#~ msgstr "I�mesti"
-
 #~ msgid "Rescue"
 #~ msgstr "I�gelb�ti"
 
@@ -9152,7 +10913,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"
@@ -9180,7 +10941,7 @@ msgstr ""
 #~ "konfiguracijos\n"
 #~ "\n"
 #~ "\n"
-#~ "Jeigu j�s �diegiate Linux-Mandrake � kompiuter�, kuris jau yra tinkle\n"
+#~ "Jeigu j�s �diegiate Mandrake Linux � kompiuter�, kuris jau yra tinkle\n"
 #~ "tinklo administratorius jums turi nurodyti informacij� apie IP adres�,\n"
 #~ "tinklo subkauk� ir tinklo kauk�. �diegiant priva�iam tinkle namuose, jums "
 #~ "tai\n"
@@ -9220,9 +10981,6 @@ msgstr ""
 #~ msgid "USB Mouse (3 buttons or more)"
 #~ msgstr "USB pel� (su 3 arba daugiau klavi��)"
 
-#~ msgid "Uninstall"
-#~ msgstr "I�mesti"
-
 #~ msgid "Uninstalling the RPMs"
 #~ msgstr "I�metami RPM'ai"
 
@@ -9376,9 +11134,6 @@ msgstr ""
 #~ msgid "formatting"
 #~ msgstr "su�ymimas"
 
-#~ msgid "garbage"
-#~ msgstr "i�kraipymai"
-
 #~ msgid "girl"
 #~ msgstr "mergina"
 
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index 3fb4f2b84..8c20503b8 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -2,69 +2,71 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Copyright (c) 2000 MandrakeSoft
 # Vitauts Stochka <vit@dpu.lv>, 2000.
+# Juris Kudi�� <cooker@inbox.lv>, 2001.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: 2001-02-27 21:48+0200\n"
-"Last-Translator: Vitauts Stochka <vit@dpu.lv>\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-08-22 00:12+0200\n"
+"Last-Translator: Juris Kudi�� <cooker@inbox.lv>\n"
 "Language-Team: Latvian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
-msgstr ""
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
+msgstr "Konfigur�t visus ekr�nus neatkar�gi"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
-msgstr ""
+msgstr "Lietot Xinerama pieb�vi"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
-msgstr ""
+msgstr "Konfigur�t tikai karti \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
-#, fuzzy
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
-msgstr "Proxy serveru konfigur�cija"
+msgstr "N-ekr�nu konfigur�cija"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
+"J�su sist�ma atbalsta n-ekr�nu konfigur�ciju.\n"
+"Ko nu dar�sim?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Grafisk� karte"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Izv�lieties grafisko karti"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
-msgstr "Nor�diet X serveri"
+msgstr "Izv�lieties X serveri"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X serveris"
 
-#: ../../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 "Kuru XFree konfigur�ciju j�s izv�laties?"
+msgstr "Kuru XFree konfigur�ciju izv�laties?"
 
-#: ../../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,17 +75,18 @@ msgstr ""
 "J�su karte sp�j nodro�in�t 3D akseler�ciju, bet tikai ar XFree %s.\n"
 "J�su karti uztur XFree %s, kam var b�t lab�ks 2D atbalsts."
 
-#: ../../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 "J�su karte sp�j nodro�in�t 3D akseler�ciju ar 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 ar aparat�ras 3D akseler�ciju"
 
-#: ../../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"
@@ -92,12 +95,12 @@ msgstr ""
 "J�su karte sp�j nodro�in�t 3D akseler�ciju ar XFree %s.\n"
 "�EMIET V�R�, KA TAS IR EKSPERIMENT�LS ATBALSTS, KAS VAR UZK�RT DATORU."
 
-#: ../../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 ar EKSPERIMENT�LU aparat�ras 3D akseler�ciju"
 
-#: ../../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 +111,31 @@ msgstr ""
 "�EMIET V�R�, KA TAS IR EKSPERIMENT�LS ATBALSTS, KAS VAR UZK�RT DATORU.\n"
 "J�su karti uztur XFree %s, kam var b�t lab�ks 2D atbalsts."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFree konfigur�cija"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Izv�lieties grafisk�s kartes atmi�as apjomu"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Nor�diet servera opcijas"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Nor�diet monitoru"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "Monitors"
 
-#: ../../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 +157,39 @@ msgstr ""
 "monitoru.\n"
 " Ja neesat p�rliecin�ts, izv�lieties konservat�v�ko variantu."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Horizont�l� frekvence"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Vertik�l� frekvence"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Monitors nav konfigur�ts"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Grafisk� karte v�l nav konfigur�ta"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Iz��irtsp�jas v�l nav izv�l�tas"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Vai v�laties izm��in�t �o konfigur�ciju?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Br�din�jums: ��s grafisk�s kartes izm��in��ana var uzk�rt datoru"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Konfigur�cijas izm��in��ana"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -190,153 +197,156 @@ msgstr ""
 "\n"
 "m��iniet izmain�t da�us parametrus"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Atkl�ta k��da:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Atliek %d sekundes"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Vai viss ir pareizi?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Atkl�ta k��da, m��iniet izmain�t da�us parametrus"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Iz��irtsp�ja"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Nor�diet iz��irtsp�ju un kr�su dzi�umu"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafisk� karte: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 serveris: %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 "Eksperta"
+msgstr "Eksperta re��ms"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Par�d�t visu"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Iz��irtsp�jas"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastat�ras izk�rtojums: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Peles tips: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Peles ier�ce: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitors: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitora horiz. frekv.: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitora vert. frekv.: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafisk� karte: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Grafisk� karte: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafisk� atmi�a: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kr�su dzi�ums: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Iz��irtsp�ja: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 serveris: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 draiveris: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Gatavoju X-Window konfigur�ciju"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Ko j�s v�laties dar�t?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Monitora mai�a"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Grafisk�s kartes mai�a"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Servera opciju mai�a"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Iz��irtsp�jas mai�a"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Par�d�t inform�ciju"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "M��in�t v�lreiz"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Iziet"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -349,20 +359,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Lai aktiviz�tu izmai�as, l�dzu aizveriet un atveriet %s sesiju"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "L�dzu aizveriet sesiju un nospiediet Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X p�c start��anas"
 
-#: ../../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?"
@@ -415,216 +425,222 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB vai vair�k"
+msgid "16 MB"
+msgstr "16 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:113
+msgid "32 MB"
+msgstr "32 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:114
+msgid "64 MB or more"
+msgstr "64 MB vai vair�k"
+
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Parasts VGA, 640x480 pie 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 pie 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 savietojams, 1024x768 pie 87 Hz ar josl�m (nav 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 pie 87 Hz ar josl�m, 800x600 pie 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 "Uzlabots Super VGA, 800x600 pie 60 Hz, 640x480 pie 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 "Ne-joslots SVGA, 1024x768 pie 60 Hz, 800x600 pie 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Augstas frekvences SVGA, 1024x768 pie 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Multi-frekven�u, kas uztur 1280x1024 pie 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Multi-frekcen�u, kas uztur 1280x1024 pie 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Multi-frekven�u, kas uztur 1280x1024 pie 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitors, kas uztur 1600x1200 pie 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitors, kas uztur 1600x1200 pie 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 "S�kn�jam�s sada�as pirmais sektors"
+msgstr "S�kn�jam�s part�cijas pirmais sektors"
 
-#: ../../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 "Diska pirmais sektors (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILO instal��ana"
 
-#: ../../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 "Kur j�s v�laties instal�t s�kn�t�ju?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "LILO/grub instal��ana"
 
-#: ../../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 "S�kn�t�ja galven�s opcijas"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
-#, fuzzy
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
-msgstr "S�kn�t�ja galven�s opcijas"
+msgstr "Kuru OS iel�d�t�ju lietot"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "S�kn�t�ja instal��ana"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "S�kn�jam� ier�ce"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nedarbojas ar veciem BIOSiem)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Kompakts"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "kompakts"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Video re��ms"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Pauze pirms noklus�t�s sist�mas iel�des"
 
-#: ../../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 "Parole"
 
-#: ../../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 "Parole (atk�rtoti)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Ierobe�ot komandrindas opcijas"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "ierobe�ot"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Izt�r�t /tmp katras s�kn��anas laik�"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Ja nepiecie�ams, preciz�jiet RAM apjomu (atrasti %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "At�aut multi profilus"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Nor�diet atmi�as apjomu Mb"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "Opcijai ``Ierobe�ot komandrindas opcijas'' nav j�gas bez paroles"
 
-#: ../../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 "L�dzu m��iniet v�lreiz"
 
-#: ../../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 "Paroles nesakr�t"
 
-#: ../../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 "Noklus�ts"
+msgstr "Noklus�t� 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."
@@ -632,147 +648,144 @@ msgstr ""
 "�eit ir da��di s�kn��anas ieraksti.\n"
 "J�s varat pievienot jaunus vai izmain�t eso�os."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Pievienot"
 
-#: ../../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 "Izdar�ts"
 
-#: ../../any.pm_.c:220
-#, fuzzy
+#: ../../any.pm_.c:217
 msgid "Modify"
-msgstr "Izmain�t RAID"
+msgstr "Main�t"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "K�da veida ierakstu gribat pievienot"
 
-#: ../../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 "Cita OS (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Cita OS (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Cita OS (windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Att�ls"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:264
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Sakne"
 
-#: ../../any.pm_.c:254 ../../any.pm_.c:283
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Papildin�t"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Las�t-rakst�t"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tabula"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Nedro�s"
 
-#: ../../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 "Nosaukums"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Noklus�ts"
 
-#: ../../any.pm_.c:284
-#, fuzzy
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
-msgstr "Initrd"
+msgstr "Initrd-izm�rs"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
-msgstr ""
+msgstr "BezVideo"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Izdz�st ierakstu"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Tuk�s nosaukums nav at�auts"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "�is nosaukums jau ir izmantots"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "K�ds ir sadal�juma tips?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Atrasti %s %s interfeisi"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Vai ir v�l k�ds?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Vai dator� ir k�ds %s interfeiss?"
 
-#: ../../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 "N�"
 
-#: ../../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 "J�"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Apskat�t dzel�u inform�ciju"
 
 #. -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 "Instal�ju draiveri %s kartei %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(modulis %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 "Kuru %s draiveri pam��in�t?"
 
-#: ../../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"
@@ -789,20 +802,20 @@ msgstr ""
 "nepiecie�amo inform�ciju? Retos gad�jumos aptauj��ana var uzk�rt datoru,\n"
 "ta�u tas nerad�s nek�dus boj�jumus."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Aptauj�t"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Nor�d�t opcijas"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Tagad j�s varat nor�d�t parametrus modulim %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -813,11 +826,11 @@ msgstr ""
 "Opciju form�ts ir ``nosaukums=v�rt�ba nosaukums2=v�rt�ba2 ...''.\n"
 "Piem�ram, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Modu�a opcijas:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -826,33 +839,33 @@ msgstr ""
 "Modu�a %s iel�de bija neveiksm�ga.\n"
 "Vai v�laties pam��in�t ar citiem parametriem?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(jau pievienots %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "�� parole ir p�r�k vienk�r�a"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "L�dzu ievadiet lietot�ja v�rdu"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Lietot�ja v�rd� var b�t tikai mazie ang�u burti, cipari, `-' un `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "��ds lietot�ja v�rds jau ir pievienots"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Pievienot lietot�ju"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -861,55 +874,68 @@ msgstr ""
 "Ievadiet lietot�ju\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Apstiprin�t lietot�ju"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "V�rds un uzv�rds"
 
-#: ../../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 "Lietot�ja v�rds"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "�aula"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Autore�istr��an�s"
 
-#: ../../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 ""
 "Sist�mu var konfigur�t t�, lai p�c start��anas autom�tiski tiktu\n"
 "atv�rta viena noteikta lietot�ja sesija. \n"
 "Ja nev�laties izmantot �o iesp�ju, nospiediet atcel�anas pogu."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Nor�diet noklus�to lietot�ju:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Nor�diet izmantojamo logu mened�eri:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "L�dzu izv�lieties izmantojamo valodu."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "J�s varat izv�l�ties citas valodas, kas b�s pieejamas p�c instal��anas"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Viss"
+
 # 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"
@@ -934,7 +960,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 "Juus sveic GRUB, opereetaajsisteemu izveeles programma!"
 
@@ -948,7 +974,7 @@ msgstr "Juus sveic GRUB, opereetaajsisteemu izveeles programma!"
 #
 #. -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 "Izmantojiet taustinus %c un %c, lai izveeleetos vajadziigo ierakstu."
@@ -963,7 +989,7 @@ msgstr "Izmantojiet taustinus %c un %c, lai izveeleetos vajadziigo ierakstu."
 #
 #. -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 "Nospiediet ievadu, lai saakneetu izveeleeto OS, 'e', lai redigeetu"
 
@@ -977,7 +1003,7 @@ msgstr "Nospiediet ievadu, lai saakneetu izveeleeto OS, 'e', lai redigeetu"
 #
 #. -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 "komandas pirms saakneesanas, vai 'c', lai izsauktu komandrindu."
 
@@ -991,26 +1017,31 @@ msgstr "komandas pirms saakneesanas, vai 'c', lai izsauktu komandrindu."
 #
 #. -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 "Izdaliitais ieraksts tiks saakneets peec %d sekundeem."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
-msgstr "nepietiek vietas sada�� /boot"
+msgstr "nepietiek vietas part�cij� /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 "Darbavirsma"
 
 #. -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 "Starta izv�lne"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Kur j�s v�laties instal�t s�kn�t�ju?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "pal�dz�ba pagaid�m nav realiz�ta.\n"
@@ -1023,828 +1054,952 @@ msgstr "S�kn��anas stila konfigur��ana"
 msgid "/_File"
 msgstr "/_Fails"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Fails/_Jauns"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Fails/_Atv�rt"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Fails/_Saglab�t"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Fails/Saglab�t _k�"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Fails/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Fails/_Beigt"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Opcijas"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Opcijas/Tests"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Pal�dz�ba"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Pal�dz�ba/_Par..."
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-#, fuzzy
-msgid "Configure"
-msgstr "X konfigur��ana"
-
-#: ../../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 "Interneta piesl�guma koplieto�ana"
-
-#: ../../bootlook.pm_.c:121
-#, fuzzy
-msgid "Lilo/grub mode"
-msgstr "Zvan��anas re��ms"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
-msgstr ""
+msgstr "NewStyle Kategoriz�jo�s Monitors"
 
-#: ../../bootlook.pm_.c:134
-#, fuzzy
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
-msgstr "Monitors"
+msgstr "NewStyle Monitors"
 
-#: ../../bootlook.pm_.c:137
-#, fuzzy
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
-msgstr "Monitora mai�a"
+msgstr "Tradicion�lais Monitors"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
-msgstr ""
+msgstr "Tradicion�lais Gtk+ Monitors"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "Palaist Aurora s�kn��anas laik�"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/grub re��ms"
+
+#: ../../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 ""
+"J�s pa�laik lietojat OS iel�d�t�ju %s.\n"
+"Spiediet Konfigur�t, lai palaistu uzst�d��anas meistaru."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Konfigur�t"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "S�kn��anas re��ms"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Sist�mas re��ms"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
-msgstr "Palaist X-Window sist�mu start��anas laik�"
+msgstr "Palaist X-Window sist�mu s�kn��anas laik�"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
-msgstr "N�, es nev�los izmantot autologin"
+msgstr "N�, negribu lietot autologin"
 
-#: ../../bootlook.pm_.c:193
-#, fuzzy
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "J�, es v�los autologin k� �is lietot�js"
+msgstr "J�, gribu lietot autologin �im lietot�jam un darba virsmai"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Sist�mas re��ms"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Noklus�ts"
-
-#: ../../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
+msgstr "Labi"
+
+#: ../../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 "Atcelt"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "nevar atv�rt /etc/inittab las��anai: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "nevar atv�rt /etc/sysconfig/autologin las��anai: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "las��anai nevar atv�rt /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 instal��ana neizdev�s. Atkl�ta ��da k��da:"
+msgstr "LILO uzst�d��ana neizdev�s. Uzrad�s ��da k��da:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Izveidot"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Nomont�t"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Izdz�st"
-
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Format�t"
+#: ../../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 "Main�t izm�ru"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Tips"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d min�tes"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Mont��anas punkts"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 min�te"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Ierakst�t /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekundes"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "P�rsl�gties uz eksperta re��mu"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Vispirms izveidojiet datu rezerves kopiju"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "P�rsl�gties uz norm�lu re��mu"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Lasiet uzman�gi!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Atjaunot no faila"
+#: ../../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 ""
+"Ja gatavojaties izmantot aboot, neaizmirstiet atst�t br�vu vietu diska\n"
+"s�kum� (pietiek ar 2048 sektoriem)"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Saglab�t fail�"
+#: ../../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 "K��da"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Meistars"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Atjanot no disketes"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Jauns"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Saglab�t disket�"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+msgid "Remote"
+msgstr "Att�la"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Izt�r�t visu"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Mont��anas punkts"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Format�t visu"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Opcijas"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Izvietot autom�tiski"
+#: ../../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 "Tips"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "Visas prim�r�s sada�as ir izmantotas"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Nomont�t"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Vairs nevaru pievienot nevienu sada�u"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Mont�ta"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Izv�lieties darb�bu"
+
+#: ../../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 ""
-"Ja v�laties vair�k sada�as, l�dzu izdz�siet vienu sada�u, lai var�tu "
-"izveidot papla�in�tu sada�u"
+"Jums ir viena liela FAT part�cija\n"
+"(parasti to izmanto MicroSoft Dos/Windows).\n"
+"Iesaku vispirms izmain�t ��s part�cijas izm�ru\n"
+"(uzklik��iniet uz t�s, tad uz \"Main�t izm�ru\")"
+
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "L�dzu uzklik��iniet uz part�cijas"
 
-#: ../../diskdrake.pm_.c:61
+#: ../../diskdrake.pm_.c:240
 #, fuzzy
-msgid "Not enough space for auto-allocating"
-msgstr "Nepietiek br�vas vietas, lai izvietotu jaunas sada�as"
+msgid "Please click on a media"
+msgstr "L�dzu uzklik��iniet uz part�cijas"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Atsaukt"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "L�dzu uzklik��iniet uz part�cijas"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Ierakst�t sada�u tabulu"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Vair�k"
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Deta�as"
 
-#: ../../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 "mont��ana neizdev�s"
+
+#: ../../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 "Tuk�s"
 
-#: ../../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 "Cits"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Failu sist�mu tipi:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Deta�as"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Izveidot"
 
-#: ../../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 ""
-"Jums ir viena liela FAT sada�a\n"
-"(parasti to izmanto MicroSoft Dos/Windows).\n"
-"Iesaku vispirms izmain�t ��s sada�as izm�ru\n"
-"(uzklik��iniet uz t�s, tad uz \"Main�t izm�ru\")"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "T� viet� izmantojiet ``%s''"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Vispirms izveidojiet datu rezerves kopiju"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Izdz�st"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Lasiet uzman�gi!"
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Vispirms izmantojiet ``Nomont�t''"
 
-#: ../../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 ""
-"Ja gatavojaties izmantot aboot, neaizmirstiet atst�t br�vu vietu diska\n"
-"s�kum� (pietiek ar 2048 sektoriem)"
+"P�c part�cijas %s tipa nomai�as visi �aj� part�cij� eso�ie dati tiks "
+"pazaud�ti"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Esiet uzman�gi: �� oper�cija ir b�stama."
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Kur j�s v�laties mont�t %s ier�ci?"
 
-#: ../../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 "K��da"
+#: ../../diskdrake.pm_.c:500
+msgid "Mount options"
+msgstr "Mont��anas iesp�jas:"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Mont��anas punkts: "
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
+msgstr "Viss kas"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Ier�ce: "
+#: ../../diskdrake.pm_.c:525
+msgid "Removable media"
+msgstr "Iz�emams datu nes�js"
 
-#: ../../diskdrake.pm_.c:240
+#: ../../diskdrake.pm_.c:532
+msgid "Change type"
+msgstr "Main�t tipu"
+
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Kuru failu sist�mu v�laties?"
+
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr "Skan�ju piejamos nfs kop�gos resursus"
+
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS iek�rtas burts: %s (tikai min�jums)\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr "Skan�ju piejamos nfs kop�gos resursus uz servera %s"
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "Tips: "
+#: ../../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
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
 #, fuzzy
-msgid "Name: "
-msgstr "Nosaukums: %s\n"
+msgid "Server"
+msgstr "serveris"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "S�kums: sektors %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Izm�rs: %s"
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr "Skan�ju piejamos samba kop�gos resursus"
 
-#: ../../diskdrake.pm_.c:256
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s sektori"
+msgid "Scanning available samba shared resource of server %s"
+msgstr "Skan�ju piejamos samba kop�gos resursus uz servera %s"
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "No cilindra %d l�dz cilindram %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose a partition"
+msgstr "Izv�lieties part�ciju"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Format�ta\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose another partition"
+msgstr "Izv�lieties citu part�ciju"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Neformat�ta\n"
+#: ../../diskdrake_interactive.pm_.c:188
+msgid "Exit"
+msgstr "Iziet"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Mont�ta\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "P�rsl�gt eksperta re��m�"
 
-#: ../../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 "P�rsl�gt norm�laj� re��m�"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback fails(i): %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Atsaukt"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Noklus�ti s�kn�jam� sada�a\n"
-"    (lai s�kn�tu MS-DOS, nevis lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Tad turpin�t?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "L�menis %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Iziet nesaglab�jot"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Gabala izm�rs %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Iziet neierakstot part�ciju tabulau?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID diski %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Vai v�laties izm��in�t �o konfigur�ciju?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Loopback faila nosaukums: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Izvietot autom�tiski"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Visu dz�st"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Vair�k"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:250
+msgid "Hard drive information"
+msgstr "Ciet� diska inform�cija"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Nepietiek br�vas vietas, lai izvietotu autom�tiski"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Visas prim�r�s part�cijas izmantotas"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Vair�k part�ciju nevar pievienot"
+
+#: ../../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 ""
+"Ja gribat vair�k part�cijas, izdz�siet k�du part�ciju, lai var�tu izveidot "
+"papla�in�to part�ciju"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Ierakst�t part�ciju tabulu"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Salabot part�ciju tabulu"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Salabot part�ciju tabulu"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Salabot part�ciju tabulu"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Iz�emams datu nes�js"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Izv�lieties failu"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../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 ""
+"Part�ciju tabulas rezerves kopijai ir at��ir�gs izm�rs\n"
+"Tom�r turpin�t, ja?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "L�dzu uzklik��iniet uz sada�as"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Uzman�bu"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Izm�rs: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Ielieciet disketi\n"
+"Visi uz disketes eso�ie dati tiks dz�sti"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "�eometrija: %s cilindri, %s galvas, %s sektori\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "M��inu sagl�bt part�ciju tabulu"
 
-#: ../../diskdrake.pm_.c:302
-#, fuzzy, c-format
-msgid "LVM-disks %s\n"
-msgstr "RAID diski %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+msgid "Detailed information"
+msgstr "Detaliz�ta inform�cija"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Sada�u tabulas tips: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Main�t izm�ru"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "uz �inas %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "P�rvietot"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Mont�ta"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Format�t"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Akt�va"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Pievienot pie RAID"
 
-#: ../../diskdrake.pm_.c:326
+#: ../../diskdrake_interactive.pm_.c:360
+msgid "Add to LVM"
+msgstr "Pievienot LVM"
+
+#: ../../diskdrake_interactive.pm_.c:363
 msgid "Remove from RAID"
 msgstr "Izsl�gt no RAID"
 
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Izmain�t RAID"
-
-#: ../../diskdrake.pm_.c:330
-#, fuzzy
-msgid "Add to LVM"
-msgstr "Pievienot pie RAID"
-
-#: ../../diskdrake.pm_.c:332
-#, fuzzy
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
-msgstr "Izsl�gt no RAID"
+msgstr "Iz�emt no LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Main�t RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Izmantot priek� loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Izv�lieties darb�bu"
-
-#: ../../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 ""
-"Diem��l es ne�au�u izveidot /boot tik t�lu uz diska (uz cilindra > 1024).\n"
-"Vai nu j�s izmantojat LILO, un tas nestr�d�s, vai ar� j�s neizmantojat LILO, "
-"un /boot jums nav vajadz�gs"
-
-#: ../../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 ""
-"Sada�a, ko j�s izv�l�j�ties pievienot k� sakni (/), fiziski atrodas aiz\n"
-"�� ciet� diska 1024. cilindra, un jums nav /boot sada�as.\n"
-"Ja j�s pl�nojat izmantot LILO, neaizmirstiet pievienot /boot sada�u"
-
-#: ../../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 ""
-"J�s izv�l�jies programmat�ras uztur�tu RAID sada�u k� saknes sada�u (/).\n"
-"Neviens s�kn�t�js nesp�j to izmantot bez /boot sada�as.\n"
-"T�p�c neaizmirstiet izveidot /boot sada�u."
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Izveidot jaunu part�ciju"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "T� viet� izmantojiet ``%s''"
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "S�kuma sektors: "
 
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Vispirms izmantojiet ``Nomont�t''"
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Izm�rs MB: "
 
-#: ../../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 ""
-"P�c sada�as %s tipa nomai�as visi �aj� sada�� eso�ie dati tiks pazaud�ti"
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Failu sist�mas tips: "
 
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Tom�r turpin�t?"
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Mont��anas punkts: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Iziet bez saglab��anas"
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Priek�roka: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Iziet bez sada�u tabulas ierakst��anas?"
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Format�ju loopback failu %s"
 
-#: ../../diskdrake.pm_.c:516
+#: ../../diskdrake_interactive.pm_.c:486
 msgid "Change partition type"
-msgstr "Nomain�t sada�as tipu"
+msgstr "Nomain�t part�cijas tipu"
 
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Kuru failsist�mu v�laties izmantot?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "J�s nevarat izmantot ReiserFS sada��m, kas maz�kas par 32MB"
+#: ../../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 "Kur j�s v�laties mont�t loopback failu %s?"
 
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Kur j�s v�laties mont�t ier�ci %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"
 msgstr ""
-"Nevaru no�emt mont��anas punktu, jo �� sada�a tiek izmantota priek� "
+"Nevaru no�emt mont��anas punktu, jo �� part�cija tiek izmantota priek� "
 "loopback.\n"
 "Vispirms no�emiet loopback"
 
-#: ../../diskdrake.pm_.c:561
-#, c-format
-msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr ""
-"P�c sada�as %s format��anas visi �aj� sada�� eso�ie dati tiks pazaud�ti"
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Izskait�oju FAT failsist�mas robe�as"
 
-#: ../../diskdrake.pm_.c:563
-msgid "Formatting"
-msgstr "Format�ju"
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Mainu izm�ru"
 
-#: ../../diskdrake.pm_.c:564
-#, c-format
-msgid "Formatting loopback file %s"
-msgstr "Format�ju loopback failu %s"
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "��s part�cijas izm�ru nevar izmain�t"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Format�ju sada�u %s"
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Visiem ��s part�cijas datiem j�izveido rezerves kopijas"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "P�c visu sada�u format��anas"
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"P�c part�cijas %s izm�ra mai�as visi �aj� part�cij� eso�ie dati tiks "
+"pazaud�ti"
 
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "visi ��j�s sada��s eso�ie dati tiks pazaud�ti"
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Nor�diet jauno izm�ru"
 
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "P�rvietot"
+#: ../../diskdrake_interactive.pm_.c:591
+msgid "New size in MB: "
+msgstr "Jauns izm�rs MB: "
 
-#: ../../diskdrake.pm_.c:577
+#: ../../diskdrake_interactive.pm_.c:631
 msgid "Which disk do you want to move it to?"
 msgstr "Uz kuru disku v�laties to p�rvietot?"
 
-#: ../../diskdrake.pm_.c:578
+#: ../../diskdrake_interactive.pm_.c:632
 msgid "Sector"
 msgstr "Sektors"
 
-#: ../../diskdrake.pm_.c:579
+#: ../../diskdrake_interactive.pm_.c:633
 msgid "Which sector do you want to move it to?"
 msgstr "Uz kuru sektoru v�laties to p�rvietot?"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving"
 msgstr "P�rvietoju"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving partition..."
-msgstr "P�rvietoju sada�u..."
+msgstr "P�rvietoju part�ciju..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Nor�diet eksist�jo�u RAID, kam pievienot"
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "jauns"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Nor�diet jau eso�u LVM kam pievienot"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM v�rds?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "�o Part�ciju nevar izmantot priek� loopback"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Loopback faila v�rds: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "V�rds un uzv�rds"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "Fails jau tiek izmantots citam loopback, nor�diet citu failu"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Fails jau eksist�. Vai to izmantot?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "ier�ce"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "l�menis"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "gabala izm�rs"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Esiet uzman�gi: �� oper�cija ir b�stama."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "K�ds ir sadal�juma tips?"
+
+#: ../../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 ""
+"Diem��l es ne�au�u izveidot /boot tik t�lu uz diska (uz cilindra > 1024).\n"
+"Vai nu j�s izmantojat LILO, un tas nestr�d�s, vai ar� j�s neizmantojat LILO, "
+"un /boot jums nav vajadz�gs"
+
+#: ../../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 ""
+"part�cija, ko j�s izv�l�j�ties pievienot k� sakni (/), fiziski atrodas aiz\n"
+"�� ciet� diska 1024. cilindra, un jums nav /boot part�cijas.\n"
+"Ja j�s pl�nojat izmantot LILO, neaizmirstiet pievienot /boot part�ciju"
+
+#: ../../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 ""
+"J�s izv�l�jies programmat�ras uztur�tu RAID part�ciju k� saknes part�ciju "
+"(/).\n"
+"Neviens s�kn�t�js nesp�j to izmantot bez /boot part�cijas.\n"
+"T�p�c neaizmirstiet izveidot /boot part�ciju."
+
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Iek�rtas %s sada�u tabula tiks ierakst�ta uz diska!"
+msgstr "Iek�rtas %s part�ciju tabula tiks ierakst�ta uz diska!"
 
-#: ../../diskdrake.pm_.c:594
+#: ../../diskdrake_interactive.pm_.c:868
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Lai izmai�as st�tos sp�k�, jums ir j�p�rstart� dators"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Izskait�oju FAT failsist�mas robe�as"
+#: ../../diskdrake_interactive.pm_.c:879
+#, c-format
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr ""
+"P�c part�cijas %s format��anas visi �aj� part�cij� eso�ie dati tiks pazaud�ti"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Mainu izm�ru"
+#: ../../diskdrake_interactive.pm_.c:881
+msgid "Formatting"
+msgstr "Format�ju"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "��s sada�as izm�ru nevar izmain�t"
+#: ../../diskdrake_interactive.pm_.c:882
+#, c-format
+msgid "Formatting loopback file %s"
+msgstr "Format�ju loopback failu %s"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Visiem ��s sada�as datiem j�izveido rezerves kopijas"
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Format�ju part�ciju %s"
+
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid neizdev�s"
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Nepietiek br�vas vietas, lai izvietotu jaunas part�cijas"
+
+#: ../../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 ""
-"P�c sada�as %s izm�ra mai�as visi �aj� sada�� eso�ie dati tiks pazaud�ti"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Nor�diet jauno izm�ru"
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Nepietiek br�vas vietas, lai izvietotu jaunas part�cijas"
 
-#: ../../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 "Izveidot jaunu sada�u"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Iz��irtsp�ja: %s\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "S�kuma sektors: "
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Ier�ce: "
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Izm�rs MB: "
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS iek�rtas burts: %s (tikai min�jums)\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Failu sist�mas tips: "
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Tips: "
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Priek�roka: "
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "V�rds: "
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "�o sada�u nevar izmantot priek� loopback"
+#: ../../diskdrake_interactive.pm_.c:954
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "S�kums: sektors %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Loopback"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Izm�rs: %s"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Loopback faila nosaukums: "
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektori"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "Fails jau tiek izmantots citam loopback, nor�diet citu failu"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "No cilindra %d l�dz cilindram %d\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Fails jau eksist�. Vai to izmantot?"
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Format�ta\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Izv�lieties failu"
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Neformat�ta\n"
 
-#: ../../diskdrake.pm_.c:876
-msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
-msgstr ""
-"Sada�u tabulas rezerves kopijai ir cits izm�rs\n"
-"Vai tom�r turpin�t?"
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Mont�ta\n"
 
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Uzman�bu"
+#: ../../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 "Loopback fails(i): %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
-"Ielieciet disketi\n"
-"Visi uz disketes eso�ie dati tiks pazaud�ti"
+"Noklus�ti s�kn�jam� part�cija\n"
+"    (lai s�kn�tu MS-DOS, nevis lilo)\n"
 
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "M��inu salabot sada�u tabulu"
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "L�menis %s\n"
 
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "ier�ce"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Gabala izm�rs %s\n"
 
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "l�menis"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID diski %s\n"
 
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "gabala izm�rs"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Loopback faila nosaukums: %s"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Nor�diet eksist�jo�u RAID, kam pievienot"
+#: ../../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 "jauns"
+#: ../../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
-#, fuzzy
-msgid "Choose an existing LVM to add to"
-msgstr "Nor�diet eksist�jo�u RAID, kam pievienot"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Izm�rs: %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 "�eometrija: %s cilindri, %s galvas, %s sektori\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr ""
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info: "
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Salabot sada�u tabulu"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-diski %s\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "P�rl�d�t"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "part�ciju tabulas tips: %s\n"
 
-#: ../../fs.pm_.c:88 ../../fs.pm_.c:95 ../../fs.pm_.c:101 ../../fs.pm_.c:107
-#: ../../fs.pm_.c:113
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "uz �inas %d id %d\n"
+
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Opcijas: %s"
+
+#: ../../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 format��ana %s neizdev�s"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Nezinu, k� format�t %s, izmantojot tipu %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "mont��ana neizdev�s"
+
+#: ../../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 "mont��ana neizdev�s: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "k��da nomont�jot %s: %s"
@@ -1857,40 +2012,43 @@ msgstr "vienk�r�s"
 msgid "server"
 msgstr "serveris"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Nevarat izmantot JFS part�cij�m, kas maz�kas par 16MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Nevarat izmantot ReiserFS p�rt�cij�m, kas maz�kas par 32MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Mont��anas punktiem j�s�kas ar /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
-msgstr "Jau eksist� sada�a ar mont��anas punktu %s\n"
-
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Cikliski mont��anas punkti %s\n"
+msgstr "Jau eksist� part�cija ar mont��anas punktu %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 "�im katalogam ir j�paliek saknes failsist�m�"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "�im mont��anas punktam ir nepiecie�ama re�la failu sist�ma (ext2, reiserfs)\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "K��da, atverot %s ierakst��anai: %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"
@@ -1898,326 +2056,405 @@ msgstr ""
 "Atkl�ta k��da - nav atrasta neviena ier�ce, kas der�tu jaunu failsist�mu "
 "veido�anai. L�dzu p�rbaudiet dzel�us, lai noskaidrotu probl�mas iemeslu"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
-msgstr "Jums nav nevienas diska sada�as!"
-
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "L�dzu nor�diet v�lamo instal��anas un sist�mas izmanto�anas valodu."
-
-#: ../../help.pm_.c:12
+msgstr "Jums nav nevienas part�cijas!"
+
+#: ../../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 ""
-"Lai turpin�tu instal��anu, jums ir j�pie�em ��s licences nosac�jumi.\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"
-"Nospiediet \"Pie�emt\", ja piekr�tat nosac�jumiem.\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"
-"Nospiediet \"Noraid�t\", ja nepiekr�tat nosac�jumiem. Instal��ana tiks "
-"p�rtraukta bez pa�reiz�j�s\n"
-"konfigur�cijas izmai��m."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Sarakst� nor�diet j�su tastat�rai atbilsto�u izk�rtojumu"
-
-#: ../../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 ""
-"Ja v�laties, lai citas valodas (iz�emot to, ko nor�d�j�t instal��anas\n"
-"s�kum�) b�tu pieejamas p�c instal��anas, l�dzu nor�diet t�s augst�k\n"
-"eso�aj� sarakst�. Ja v�laties izmantot visas, nospiediet \"Viss\"."
-
-#: ../../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 ""
+"Augst�k ir uzskait�tas eksist�jo��s Linux part�cijas, kas ir atrastas uz "
+"j�su\n"
+"ciet� diska. J�s varat atst�t meistara izdar�to izv�li, jo t� ir laba\n"
+"parast�m vajadz�b�m. Ja j�s izmain�t �o izv�li, jums ir j�defin� vismaz\n"
+"saknes part�cij�(\"/\"). Neizv�lieties p�r�k mazu part�ciju, cit�di j�s "
+"nevar�sit\n"
+"instal�t visas vajadz�g�s programmas. Ja v�laties datus glab�t atsevi���\n"
+"part�cij�, jums ir j�nor�da ar� \"/home\" (to var izdar�t tikai tad, ja jums "
+"ir\n"
+"vair�kas Linux part�cijas).\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
 "\n"
+"J�su zin��anai, katra part�cija ir uzskait�ta ��d� veid�: \"Nosaukums\", "
+"\"Izm�rs\".\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"
+"\"Nosaukums\" ir kod�ts ��di: \"ciet� diska tips\", \"ciet� diska numurs\",\n"
+"\"part�cijas numurs\" (piem�ram, \"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"
+"\"Ciet� diska tips\" ir \"hd\", ja j�su cietais disks ir IDE disks, \"sd\",\n"
+"ja tas ir SCSI cietais disks.\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 ""
-"L�dzu izv�lieties \"Instal�t\", ja nav instal�ta vec�ka Linux-Mandrak "
-"versija\n"
-"vai j�s v�laties izmantot vair�kas oper�t�jsist�mas.\n"
+"\"Ciet� diska numurs\" vienm�r ir burts p�c \"hd\" vai \"sd\". IDE diskiem:\n"
 "\n"
+"   * \"a\" noz�m� \"prim�r� IDE kontroliera galvenais disks\",\n"
 "\n"
-"L�dzu izv�lieties \"Atjaunin�t\", ja j�s v�laties atjaunin�t jau instal�tu\n"
-"Linux-Mandrake versiju.\n"
+"   * \"b\" noz�m� \"prim�r� IDE konytroliera pak�rtotais disks\",\n"
 "\n"
+"   * \"c\" noz�m� \"sekund�r� IDE kontroliera galvenais disks\",\n"
 "\n"
-"Atkar�b� no j�su GNU/Linux zin��an�m, varat izv�l�ties vienu no "
-"sekojo�ajiem\n"
-"Linux-Mandrake instal��anas vai atjaunin��anas l�me�iem:\n"
+"   * \"d\" noz�m� \"sekund�r� IDE kontroliera pak�rtotais disks\".\n"
 "\n"
-"\t* Ieteicama: ja neesat ne reizi instal�jis GNU/Linux oper�t�jsist�mu, "
-"izv�lieties �o l�meni. Instal��ana b�s\n"
-"\t  �oti vienk�r�a, un jums tiks uzdoti tikai da�i jaut�jumi.\n"
 "\n"
+"SCSI diskiem \"a\" noz�m� \"prim�rais cietais disks\", \"b\" noz�m�\n"
+" \"sekund�rais cietais disks\", utt..."
+
+#: ../../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* Piel�gota: ja pietiekami labi p�rzinat GNU/Linux, varat nor�d�t sist�mas "
-"pamatpielietojumu (darbastacija, serveris,\n"
-"\t  izstr�dei). Jums b�s j�atbild uz vair�k jaut�jumiem nek� \"Ieteicamas\" "
-"instal��anas klases gad�jum�, t�p�c\n"
-"\t  jums j�zina, k� darbojas GNU/Linux, ja gribat izv�l�ties �o klasi.\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* Eksperta: ja j�s labi zinat GNU/Linux, varat izv�l�ties �o instal��anas "
-"klasi. T�pat k� \"Piel�gotas\" klases\n"
-"\t  gad�jum�, j�s var�sit nor�d�t sist�mas pamatpielietojumu (darbastacija, "
-"serveris, izstr�dei). Esiet �oti\n"
-"\t  uzman�gi, pirms izv�laties �o klasi. J�s var�sit veikt �oti prec�zi "
-"piel�gotu instal��anu.\n"
-"\t  Uz da�iem jaut�jumiem b�s gr�ti atbild�t, ja j�su GNU/Linux zin��anas "
-"nav pietieko�i labas. T�p�c neizv�lieties\n"
-"\t  �o instal��anas klasi, ja neesat p�rliecin�ts."
-
-#: ../../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 ""
-"Izv�lieties:\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"
-"  - Piel�gota: Ja pietiekami labi p�rzinat GNU/Linux, jums tiks dota\n"
-"    iesp�ja nor�d�t sist�mu pielietojumu. S�k�ka inform�cija b�s\n"
-"    pieejam v�l�k.\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"
-"  - Eksperta: Noder�s, ja j�s labi p�rzinat GNU/Linux un v�laties veikt\n"
-"    prec�zi piel�gotu instal�ciju. T�pat k� piel�gotas instal�cijas\n"
-"    gad�jum�, jums tiks dota iesp�ja nor�d�t sist�mas pielietojumu.\n"
-"    Tom�r l�dzu, NEIZV�LIETIES �O, JA J�S NEESAT P�RLIECIN�TS PAR\n"
-"    SAVU R�C�BU!"
+"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 ""
-"Tagad jums ir j�nor�da ma��nas pielietojums. Varat izv�l�ties:\n"
-"\n"
-"\t* Darbastacija: �� ir ide�la izv�le, ja pl�nojat sist�mu galvenok�rt "
-"izmantot ikdienas vajadz�b�m biroj� vai m�j�s.\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* Izstr�dei: ja pl�nojat sist�mu izmantot galvenok�rt programmat�ras "
-"izstr�dei, �� ir laba izv�le. �aj�\n"
-"\t gad�jum� tiks instal�ts pilns programmu komplekts, lai j�s var�tu "
-"kompil�t, atk��dot un format�t s�kumkodu vai\n"
-"\t veidot programmat�ras pakotnes.\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* Serveris: ja pl�nojat sist�mu izmantot k� serveri, �� ir laba izv�le. "
-"Tas var b�t failu serveris (NFS vai\n"
-"\t SMB), drukas serveris (Unix stila vai Microsoft Windows stila), "
-"autentific��anas serveris (NIS),\n"
-"\t datub�zu serveris utt. �aj� gad�jum� neceriet, ka tiks instal�ti k�di "
-"izskaistin�jumi (KDE, GNOME, un tml.)."
+"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 ""
+"Tagad varat nor�d�t servisus, kurus j�s v�laties start�t sist�mas\n"
+"palai�anas laik�.\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"
+"Kad pele p�rvietojas p�r saraksta elementu, par�d�s\n"
+"neliels pal�dz�bas balons, kas paskaidro servisa lomu.\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)."
-msgstr ""
-"DrakX m��in�s samekl�t PCI SCSI adapteri(us).\n"
-"Ja DrakX atrad�s k�du SCSI adapteri un zin�s, kuru draiveri izmantot,\n"
-"tas tiks instal�ts autom�tiski.\n"
 "\n"
-"Ja jums nav SCSI adapteru, ir ISA SCSI adapteris vai PCI SCSI adapteris,\n"
-"ko DrakX neatpaz�st, jums tiks pajaut�ts, vai j�su sist�m� ir SCSI\n"
-"adapteris. Ja nav SCSI adapteru, j�s varat vienk�r�i izv�l�ties 'N�'.\n"
-"Ja j�s izv�laties 'J�', jums tiks par�d�ts draiveru saraksts, kur�\n"
-"varat izv�l�ties vajadz�go adapteri.\n"
+"Esiet �pa�i uzman�gs �aj� sol�, ja v�laties sist�mu izmantot ka serveri:\n"
+"iesp�jams, ka nev�laties start�t nevienu nevajadz�gu servisu. Atcerieties.\n"
+"ka da�i servisi var b�t b�stami, ja darbojas server�.\n"
+"Parasti izv�lieties tikai tos servisus, kas jums tie��m nepiecie�ami."
+
+#: ../../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 laiku r��ina p�c GMT jeb \"Gr�ni�as Meridi�na Laika\" un p�rv�r�\n"
+"to par viet�jo laiku atbilsto�i j�su izv�l�tajai laika joslai."
+
+#: ../../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"
-"Ja jums nepiecie�ams patst�v�gi nor�d�t adapteri, DrakX pajaut�s, vai\n"
-"v�laties nor�d�t adaptera opcijas. Jums b�tu j��auj DrakX aptauj�t\n"
-"dzel�us un noskaidrot opcijas. Parasti tas izdodas bez probl�m�m.\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"
-"Ja neizdodas, jums patst�v�gi j�nor�da draivera opcijas.\n"
-"Izlasiet Instal��anas rokasgr�matu (3. noda�u, apak�noda�u \"Inform�cijas "
-"sav�k�ana par j�su dzel�iem\"), lai uzzin�tu, k� ieg�t �o\n"
-"inform�ciju no dzel�u dokument�cijas, ra�ot�ja t�kla lapas\n"
-"(ja jums ir pieejams Internets) vai Windows (ja tas ir uzst�d�ts j�su "
-"dator�)."
+"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 ""
-"Pa�laik jums ir j�izv�las, kur uz ciet� diska instal�t Linux-Mandrake\n"
+"Pa�laik jums ir j�izv�las, kur uz ciet� diska instal�t Mandrake Linux\n"
 "oper�t�jsist�mu. Ja disks ir tuk�s vai cita oper�t�jsist�ma aiz�em visu\n"
 "vietu uz diska, jums b�s j�veic diska sadal��ana. �sum�, ciet� diska\n"
 "sadal��ana noz�m� to sadal�t lo�isk�s da��s, lai izveidotu vietu\n"
-"Linux-Mandrake sist�mas instal��anai.\n"
+"Mandrake Linux sist�mas instal��anai.\n"
 "\n"
 "\n"
 "Sakar� ar to, ka diska sadal��anas process parasti ir neatgriezenisks,\n"
@@ -2226,164 +2463,272 @@ msgstr ""
 "rokasgr�matu un visu labi p�rdom�jiet.\n"
 "\n"
 "\n"
-"Jums ir nepiecie�amas vismaz divas sada�as. Viena vajadz�ga pa�ai sist�mai,\n"
-"otra - virtu�lajai atmi�ai (ko sauc par Swap).\n"
+"Jums ir nepiecie�amas vismaz divas part�cijas. Viena vajadz�ga pa�ai "
+"sist�mai,\n"
+"otra - virtu�lajai atmi�ai (Swap).\n"
 "\n"
 "\n"
-"Ja sada�as jau izveidotas (agr�kas instal��anas laik� vai ar citu diska\n"
-"sadal��anas r�ku), jums tikai j�nor�da t�s sada�as, kur�s v�laties\n"
+"Ja part�cijas jau izveidotas (agr�kas instal��anas laik� vai ar citu diska\n"
+"sadal��anas r�ku), jums tikai j�nor�da t�s part�cijas, kur�s v�laties\n"
 "instal�t Linux sist�mu.\n"
 "\n"
 "\n"
-"Ja sada�as v�l nav izveidotas, jums t�s ir j�izveido. Lai to izdar�tu,\n"
+"Ja part�cijas v�l nav izveidotas, jums t�s ir j�izveido. Lai to izdar�tu,\n"
 "izmantojiet augst�k pieejamo meistaru. Atkar�b� no j�su ciet� diska \n"
 "konfigur�cijas ir iesp�jami vair�ki risin�jumi:\n"
 "\n"
-"\t* Izmantot eso�u sada�u: meistars uz ciet� diska ir atkl�jis vienu vai "
-"vair�kas Linux sada�as. Ja v�laties\n"
-"\t t�s saglab�t, izv�lieties �o opciju. \n"
+"* Izmantot eso�u part�ciju: meistars uz ciet� diska ir atkl�jis vienu vai "
+"vair�kas Linux part�cijas. Ja v�laties\n"
+" t�s saglab�t, izv�lieties �o opciju. \n"
 "\n"
 "\n"
-"\t* Izdz�st visu disku: ja v�laties izdz�st visus uz diska eso�os datus un "
-"sada�as un aizst�t t�s ar jaunu\n"
-"\t  Linux-Mandrake sist�mu, varat izv�l�ties �o opciju. Esiet uzman�gi, "
+"* Izdz�st visu disku: ja v�laties izdz�st visus uz diska eso�os datus un "
+"part�cijas un aizst�t t�s ar jaunu\n"
+"  Mandrake Linux sist�mu, varat izv�l�ties �o opciju. Esiet uzman�gi, "
 "izv�loties �o risin�jumu, jo p�c\n"
-"\t  apstiprin��anas j�s vairs nevar�sit atteikties no ��s izv�les.\n"
+"  apstiprin��anas j�s vairs nevar�sit atteikties no ��s izv�les.\n"
 "\n"
 "\n"
-"\t* Izmanto br�vo vietu Windows sada��: ja uz ciet� diska ir instal�ts "
+"* Izmanto br�vo vietu Windows part�cij�: ja uz ciet� diska ir instal�ts "
 "Microsoft Windows, kas aiz�em visu\n"
-"\t  vietu, jums ir j�atbr�vo vieta Linux datiem. Lai to izdar�tu, j�s varat "
-"nodz�st Microsoft Windows sada�u un\n"
-"\t  datus (skat�t risin�jumus \"Izdz�st visu disku\" vai \"Eksperta re��ms"
-"\") vai izmain�t Microsoft\n"
-"\t  Windows sada�as izm�ru. Sada�as izm�ru var izmain�t bez datu zaud��anas. "
-"�is risin�jums ir ieteicams, ja\n"
-"\t  j�s sav� dator� v�laties izmantot gan Linux-Mandrake, gan Microsoft "
+"  vietu, jums ir j�atbr�vo vieta Linux datiem. Lai to izdar�tu, j�s varat "
+"nodz�st Microsoft Windows part�ciju un\n"
+"  datus (skat�t risin�jumus \"Izdz�st visu disku\" vai \"Eksperta re��ms\") "
+"vai izmain�t Microsoft\n"
+"  Windows part�cijas izm�ru. part�cijas izm�ru var izmain�t bez datu "
+"zaud��anas. �is risin�jums ir ieteicams, ja\n"
+"  j�s sav� dator� v�laties izmantot gan Mandrake Linux, gan Microsoft "
 "Windows.\n"
 "\n"
 "\n"
-"\t  Pirms izv�laties �o risin�jumu, �emiet v�r�, ka Microsoft Windows "
-"sada�as izm�rs b�s maz�ks, nek� tas ir\n"
-"\t  pa�laik. Tas noz�m�, ka jums Microsoft Windows sist�m� b�s maz�k vietas "
+"  Pirms izv�laties �o risin�jumu, �emiet v�r�, ka Microsoft Windows "
+"part�cijas izm�rs b�s maz�ks, nek� tas ir\n"
+"  pa�laik. Tas noz�m�, ka jums Microsoft Windows sist�m� b�s maz�k vietas "
 "datiem vai programmu instal��anai.\n"
 "\n"
 "\n"
-"\t* Eksperta re��ms: ja j�s v�laties patst�v�gi veidot diska sada�as, varat "
+"* Eksperta re��ms: ja j�s v�laties patst�v�gi veidot diska part�cijas, varat "
 "izv�l�ties �o variantu. Esiet\n"
-"\t  uzman�gi, izveloties �o risin�jumu. Tas ir ar pla��m iesp�j�m, bet �oti "
+"  uzman�gi, izveloties �o risin�jumu. Tas ir ar pla��m iesp�j�m, bet �oti "
 "b�stams. J�s varat pazaud�t\n"
-"\t  visus datus, t�p�c izv�lieties tikai tad, ja zinat, ko dar�t."
+"  visus datus, t�p�c izv�lieties tikai tad, ja zinat, ko dar�t."
+
+#: ../../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:160
+#: ../../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 ""
+"Visas jaunizveidot�s part�cijas ir j�format�, pirms t�s var izmantot\n"
+"(format��ana noz�m� failsist�mas izveido�anu).\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"
+"Tagad j�s ar� varat izv�l�ties p�rformat�t da�as jau eso�as part�cijas, lai\n"
+"izdz�stu taj�s eso�o inform�ciju. Ja j�s v�laties to dar�t, nor�diet\n"
+"part�cijas, kuras v�laties format�t.\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"
+"�emiet v�r�, ka nav nepiecie�ams p�rformat�t visas jau eksist�jo�as "
+"part�cijas.\n"
+"Jums ir j�format� part�cijas, kur�s atrodas oper�t�jsist�ma (piem�ram, \"/"
+"\",\n"
+"\"/usr\" vai \"/var\"), bet nav j�format� part�cijas, kur�s atrodas dati, "
+"ko\n"
+"j�s v�laties saglab�t (parasti /home).\n"
+"\n"
+"\n"
+"Esiet uzman�gi, izv�loties part�cijas, jo p�c format��anas visi dati b�s\n"
+"izn�cin�ti un j�s vairs nevar�sit tos atjaunot.\n"
+"\n"
+"\n"
+"Noklik��iniet \"Labi\", kad esat gatavi format�t part�cijas.\n"
+"\n"
+"\n"
+"Noklik��iniet \"Atcelt\", ja j�s gribat izv�l�ties citas part�cijas, kur\n"
+"instal�t jauno Mandrake Linux oper�t�jsist�mu."
+
+#: ../../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 ""
+"J�su jaun� Mandrake Linux oper�t�jsist�ma pa�laik tiek\n"
+"instal�ta. �� darb�ba aiz�ems da�as min�tes (tas ir atkar�gs no apjoma,\n"
+"ko j�s izv�l�j�ties instal�t, un no j�su datota �truma.)\n"
 "\n"
 "\n"
-"   * Undo: you can use this option to cancel your changes.\n"
+"L�dzu esiet paciet�gs."
+
+#: ../../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 ""
-"Pa�laik jums ir j�izv�las, kur�(s) diska sada��(s) instal�t Linux-Mandrake\n"
-"oper�t�jsist�mu. Ja sada�as jau ir izveidotas (agr�kas GNU/Linux "
+"Pa�laik jums ir j�izv�las, kur�(s) diska part�cij�(s) instal�t Mandrake "
+"Linux\n"
+"oper�t�jsist�mu. Ja part�cijas jau ir izveidotas (agr�kas GNU/Linux "
 "instal��anas\n"
 "laik� vai ar citu diska sadal��anas r�ku), j�s varat izmantot eso��s "
 "dada�as.\n"
-"Citos gad�jumos ir j�veido jaunas diska sada�as.\n"
+"Citos gad�jumos ir j�veido jaunas diska part�cijas.\n"
 "\n"
 "\n"
-"Lai veidotu sada�as, jums vispirms ir j�izv�las cietais disks. J�s varat\n"
+"Lai veidotu part�cijas, jums vispirms ir j�izv�las cietais disks. J�s varat\n"
 "nor�d�t sadal�mo disku, noklik��inot uz \"hda\" pirmajam IDE diskam,\n"
 "\"hdb\" - otrajam diskam, \"sda\" - pirmajam SCSI diskam, utt.\n"
 "\n"
 "\n"
 "Lai sadal�tu izv�l�to cieto disku, varat izmantot sekojo�as opcijas:\n"
 "\n"
-"   * Izdz�st visu: �� opcija izdz�� visas sada�as, kas atrodas uz izv�l�t� "
-"ciet� diska.\n"
+"   * Izdz�st visu: �� opcija izdz�� visas part�cijas, kas atrodas uz "
+"izv�l�t� ciet� diska.\n"
 "\n"
 "\n"
 "   * Izvietot autom�tiski: �� opcija �auj jums autom�tiski izveidot Ext2 un "
-"swap sada�as j�su ciet� diska\n"
+"swap part�cijas j�su ciet� diska\n"
 "     br�vaj� viet�.\n"
 "\n"
 "\n"
-"   * Salabot sada�u tabulu: ja sada�u tabula ir boj�ta, j�s varat m��in�t to "
-"autjaunot, izmantojot �o opciju.\n"
+"   * Salabot part�ciju tabulu: ja part�ciju tabula ir boj�ta, j�s varat "
+"m��in�t to autjaunot, izmantojot �o opciju.\n"
 "     Esiet uzman�gi un atcerieties, ka tas var neizdoties.\n"
 "\n"
 "\n"
@@ -2391,7 +2736,7 @@ msgstr ""
 "\n"
 "\n"
 "   * P�rl�d�t: j�s varat izmantot �o opciju, ja v�laties atsaukt visas "
-"izmai�as un iel�d�t s�kotn�jot sada�u tabulu.\n"
+"izmai�as un iel�d�t s�kotn�jot part�ciju tabulu.\n"
 "\n"
 "\n"
 "   * Meistart: Ja ciet� diska sadal��anai v�laties izmantot meistaru, varat "
@@ -2400,11 +2745,11 @@ msgstr ""
 "\n"
 "\n"
 "   * Atjaunot no disketes: ja iepriek��j�s instal��anas laik� saglab�j�t "
-"sada�u tabulu disket�, j�s varat\n"
+"part�ciju tabulu disket�, j�s varat\n"
 "     to atjaunot, izmantojot �o opciju.\n"
 "\n"
 "\n"
-"   * Saglab�t disket�: ja v�laties sada�u tabulu saglab�t disket�, lai "
+"   * Saglab�t disket�: ja v�laties part�ciju tabulu saglab�t disket�, lai "
 "var�tu to atjaunot, izmantojiet �o\n"
 "     opciju. Ir �oti ieteicams izmantot �o opciju.\n"
 "\n"
@@ -2414,181 +2759,63 @@ msgstr ""
 "\n"
 "\n"
 "J�su zin��anai, jebkuru opciju var izsaukt ar tastat�ru: p�rvietojieties "
-"starp sada��m, izmantojot Tab un Au�up/Lejup bulti�as.\n"
+"starp part�cij�m, izmantojot Tab un Au�up/Lejup bulti�as.\n"
 "\n"
 "\n"
-"Kad ir izv�l�ta sada�a, j�s varat izmantot:\n"
+"Kad ir izv�l�ta part�cija, j�s varat izmantot:\n"
 "\n"
-"           * Ctrl-c, lai izveidotu jaunu sada�u (kad ir izv�l�ta tuk�a "
-"sada�a)\n"
+"           * Ctrl-c, lai izveidotu jaunu part�ciju (kad ir izv�l�ta tuk�a "
+"part�cija)\n"
 "\n"
-"           * Ctrl-d, lai izdz�stu sada�u\n"
+"           * Ctrl-d, lai izdz�stu part�ciju\n"
 "\n"
 "           * Ctrl-m, lai uzst�d�tu mont��anas punktu"
 
-#: ../../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 ""
-"Augst�k ir uzskait�tas eksist�jo��s Linux sada�as, kas ir atrastas uz j�su\n"
-"ciet� diska. J�s varat atst�t meistara izdar�to izv�li, jo t� ir laba\n"
-"parast�m vajadz�b�m. Ja j�s izmain�t �o izv�li, jums ir j�defin� vismaz\n"
-"saknes sada��(\"/\"). Neizv�lieties p�r�k mazu sada�u, cit�di j�s nevar�sit\n"
-"instal�t visas vajadz�g�s programmas. Ja v�laties datus glab�t atsevi���\n"
-"sada��, jums ir j�nor�da ar� \"/home\" (to var izdar�t tikai tad, ja jums "
-"ir\n"
-"vair�kas Linux sada�as).\n"
-"\n"
-"\n"
-"J�su zin��anai, katra sada�a ir uzskait�ta ��d� veid�: \"Nosaukums\", "
-"\"Izm�rs\".\n"
-"\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"\"Nosaukums\" ir kod�ts ��di: \"ciet� diska tips\", \"ciet� diska numurs\",\n"
-"\"sada�as numurs\" (piem�ram, \"hda1\").\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"
-"\"Ciet� diska tips\" ir \"hd\", ja j�su cietais disks ir IDE disks, \"sd\",\n"
-"ja tas ir SCSI cietais disks.\n"
-"\n"
-"\n"
-"\"Ciet� diska numurs\" vienm�r ir burts p�c \"hd\" vai \"sd\". IDE diskiem:\n"
-"\n"
-"   * \"a\" noz�m� \"prim�r� IDE kontroliera galvenais disks\",\n"
-"\n"
-"   * \"b\" noz�m� \"prim�r� IDE konytroliera pak�rtotais disks\",\n"
-"\n"
-"   * \"c\" noz�m� \"sekund�r� IDE kontroliera galvenais disks\",\n"
-"\n"
-"   * \"d\" noz�m� \"sekund�r� IDE kontroliera pak�rtotais disks\".\n"
-"\n"
-"\n"
-"SCSI diskiem \"a\" noz�m� \"prim�rais cietais disks\", \"b\" noz�m�\n"
-" \"sekund�rais cietais disks\", utt..."
-
-#: ../../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 ""
-"Nor�diet cieto disku, ko v�laties izdz�st, lai izveidotu jaunu\n"
-"Linux-Mandrake sada�u. Esiet uzman�gi, jo visi disk� eso�ie dati\n"
-"pazud�s un neb�s atjaunojami."
-
-#: ../../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"
+" * \"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"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
-"Nospiediet \"Labi\", ja v�laties izdz�st visus datus un\n"
-"sada�as, kas atrodas uz �� ciet� diska. Esiet uzman�gi, p�c \"Labi\" "
-"nospie�anas j�s nevar�sit atjaunot nek�dus datus vai sada�as, kas atrad�s\n"
-"uz diska, taj� skait� ar� Windows datus.\n"
+"Uz j�su ciet� diska ir atrasta vair�k nek� viena Microsoft Windows "
+"part�cija.\n"
+"L�dzu izv�lieties to part�ciju, kuras izm�ru j�s v�laties izmain�t, lai\n"
+"instal�tu jauno Mandrake Linux oper�t�jsist�mu.\n"
 "\n"
 "\n"
-"Nospiediet \"Atcelt\", lai atceltu �o oper�ciju bez jebk�du uz �� diska "
-"eso�u datu vai sada�u pazaud��anas."
-
-#: ../../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"
+"J�su zin��anai, katra part�cija ir uzskait�ta ��d� veid�: \"Linux nosaukums"
 "\",\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 ""
-"Uz j�su ciet� diska ir atrasta vair�k nek� viena Microsoft Windows sada�a.\n"
-"L�dzu izv�lieties to sada�u, kuras izm�ru j�s v�laties izmain�t, lai\n"
-"instal�tu jauno Linux-Mandrake oper�t�jsist�mu.\n"
-"\n"
-"\n"
-"J�su zin��anai, katra sada�a ir uzskait�ta ��d� veid�: \"Linux nosaukums\",\n"
 "\"Windows nosaukums\" \"Izm�rs\".\n"
 "\n"
 "\"Linux nosaukums\" ir kod�ts ��di: \"ciet� diska tips\", \"ciet� diska\n"
-"numurs\", \"sada�as numurs\" (piem�ram, \"hda1\").\n"
+"numurs\", \"part�cijas numurs\" (piem�ram, \"hda1\").\n"
 "\n"
 "\n"
 "\"Ciet� diska tips\" ir \"hd\", ja j�su cietais disks ir IDE disks, \"sd\",\n"
@@ -2610,779 +2837,231 @@ msgstr ""
 " \"sekund�rais cietais disks\", utt...\n"
 "\n"
 "\"Windows nosaukums\" ir j�su ciet� diska burts Windows vid� (pirmais disks\n"
-"vai sada�a saucas \"C:\")."
+"vai part�cija saucas \"C:\")."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr "L�dzu esat paciet�gs. �� darb�ba var ilgt vair�kas min�tes."
 
-#: ../../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"
-"\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"
+" * 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 ""
-"Visas jaunizveidot�s sada�as ir j�format�, pirms t�s var izmantot\n"
-"(format��ana noz�m� failsist�mas izveido�anu).\n"
+"L�dzu izv�lieties \"Instal�t\", ja nav instal�ta vec�ka Linux-Mandrak "
+"versija\n"
+"vai j�s v�laties izmantot vair�kas oper�t�jsist�mas.\n"
 "\n"
 "\n"
-"Tagad j�s ar� varat izv�l�ties p�rformat�t da�as jau eso�as sada�as, lai\n"
-"izdz�stu taj�s eso�o inform�ciju. Ja j�s v�laties to dar�t, nor�diet\n"
-"sada�as, kuras v�laties format�t.\n"
+"L�dzu izv�lieties \"Atjaunin�t\", ja j�s v�laties atjaunin�t jau instal�tu\n"
+"Mandrake Linux versiju.\n"
 "\n"
 "\n"
-"�emiet v�r�, ka nav nepiecie�ams p�rformat�t visas jau eksist�jo�as "
-"sada�as.\n"
-"Jums ir j�format� sada�as, kur�s atrodas oper�t�jsist�ma (piem�ram, \"/\",\n"
-"\"/usr\" vai \"/var\"), bet nav j�format� sada�as, kur�s atrodas dati, ko\n"
-"j�s v�laties saglab�t (parasti /home).\n"
-"\n"
+"Atkar�b� no j�su GNU/Linux zin��an�m, varat izv�l�ties vienu no "
+"sekojo�ajiem\n"
+"Mandrake Linux instal��anas vai atjaunin��anas l�me�iem:\n"
 "\n"
-"Esiet uzman�gi, izv�loties sada�as, jo p�c format��anas visi dati b�s\n"
-"izn�cin�ti un j�s vairs nevar�sit tos atjaunot.\n"
+"* Ieteicama: ja neesat ne reizi instal�jis GNU/Linux oper�t�jsist�mu, "
+"izv�lieties �o l�meni. Instal��ana b�s\n"
+"  �oti vienk�r�a, un jums tiks uzdoti tikai da�i jaut�jumi.\n"
 "\n"
 "\n"
-"Noklik��iniet \"Labi\", kad esat gatavi format�t sada�as.\n"
+"* Piel�gota: ja pietiekami labi p�rzinat GNU/Linux, varat nor�d�t sist�mas "
+"pamatpielietojumu (darbastacija, serveris,\n"
+"  izstr�dei). Jums b�s j�atbild uz vair�k jaut�jumiem nek� \"Ieteicamas\" "
+"instal��anas klases gad�jum�, t�p�c\n"
+"  jums j�zina, k� darbojas GNU/Linux, ja gribat izv�l�ties �o klasi.\n"
 "\n"
 "\n"
-"Noklik��iniet \"Atcelt\", ja j�s gribat izv�l�ties citas sada�as, kur\n"
-"instal�t jauno Linux-Mandrake oper�t�jsist�mu."
+"* Eksperta: ja j�s labi zinat GNU/Linux, varat izv�l�ties �o instal��anas "
+"klasi. T�pat k� \"Piel�gotas\" klases\n"
+"  gad�jum�, j�s var�sit nor�d�t sist�mas pamatpielietojumu (darbastacija, "
+"serveris, izstr�dei). Esiet �oti\n"
+"  uzman�gi, pirms izv�laties �o klasi. J�s var�sit veikt �oti prec�zi "
+"piel�gotu instal��anu.\n"
+"  Uz da�iem jaut�jumiem b�s gr�ti atbild�t, ja j�su GNU/Linux zin��anas nav "
+"pietieko�i labas. T�p�c neizv�lieties\n"
+"  �o instal��anas klasi, ja neesat p�rliecin�ts."
 
-#: ../../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 ""
-"Tagad varat izv�l�ties instal�jamo vai uzlabojamo pakot�u grupu.\n"
-"\n"
-"\n"
-"P�c tam DrakX p�rbaud�s, vai pietiek vietas to visu instal��anai.\n"
-"Ja nav vietas, j�s br�din�s par to. Ja v�laties turpin�t, neskatoties\n"
-"uz to, izv�l�to grupu instal��ana turpin�sies, ta�u tiks izlaistas\n"
-"da�as maz�k noder�gas pakotnes. Saraksta apak�� varat izv�l�ties\n"
-"opciju \"Atsevi��u pakot�u izv�le\"; �aj� gad�jum� jums vajadz�s\n"
-"caurskat�t vair�k nek� 1000 pakot�u sarakstu..."
 
-#: ../../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"
+"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 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 ""
-"Tagad j�s varat atsevi��i izv�l�ties visas pakotnes, ko gribat insrtal�t.\n"
-"\n"
-"\n"
-"J�s varat izv�str vai sak�aut koku, noklik��inot uz opcij�m pakot�u loga\n"
-"kreisaj� st�r�.\n"
-"\n"
-"\n"
-"Ja j�s v�laties redz�t visas sakotnes sak�rtotas alfab�ta sec�b�,\n"
-"noklik��iniet uz ikonas \"Sak�rtots vien� sarakst� vai pa grup�m\"\n"
-"\n"
-"\n"
-"Ja j�s nev�laties, lai j�s br�dina par atkar�b�m, noklik��iniet uz\n"
-"\"Autom�tiskas atkar�bas\". Ja j�s t� izdar�t, �emiet v�r�, ka atteik�an�s\n"
-"no vienas pakotnes var izsaukt atteik�anos no vair�k�m cit�m pakotn�m,\n"
-"kas ir no t�s atkar�gas."
 
-#: ../../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 ""
-"Ja jums ir visi �aj� sarakst� nor�d�tie CD, nospiediet Labi.\n"
-"Ja jums nav neviena no nor�d�tajiem CD, nospiediet Atcelt.\n"
-"Ja tr�kst tikai da�u CD, sarakst� atsl�dziet tos un nospiediet Labi."
-
-#: ../../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 ""
-"J�su jaun� Linux-Mandrake oper�t�jsist�ma pa�laik tiek\n"
-"instal�ta. �� darb�ba aiz�ems da�as min�tes (tas ir atkar�gs no apjoma,\n"
-"ko j�s izv�l�j�ties instal�t, un no j�su datota �truma.)\n"
-"\n"
-"\n"
-"L�dzu esiet paciet�gs."
-
-#: ../../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 ""
-"Tagad varat izm��in�t peli. Izmantojiet pogas un riteni, lai\n"
-"p�rliecin�tos, ka konfigur�cija ir pareiza. Ja nav, varat nospiest\n"
-"\"Atcelt\" un izv�l�ties citu draiveri."
 
-#: ../../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 ""
 "L�dzu izv�lieties pareizu portu. Piem�ram, MS Windows\n"
 "ports COM1 GNU/Linux vid� saucas 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 ""
-"Ja v�laties savu datoru piesl�gt Internetam vai lok�lam datort�klam,\n"
-"l�dzu izv�lieties pareizu opciju. L�dzu vispirms iesl�dziet attiec�gu\n"
-"ier�ci, pirms izv�laties opciju, lai DrakX noteiktu to autom�tiski.\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"
-"Ja jums nav nek�da piesl�guma Internetam vai lok�lam datort�klam,\n"
-"izv�lieties \"Atsl�gt t�klu\".\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"
-"Ja j�s v�laties konfigur�t t�klu v�l�k p�c instal��anas, vai ar� esat\n"
-"jau pabeigu�i konfigur�t j�su t�kla piesl�gumu, izv�lieties \"Izdar�ts\"."
-
-#: ../../help.pm_.c:399
-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 ""
-"Mod�ms nav atrasts. L�dzu nor�diet, kuram seri�lajam portam tas piesl�gts.\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
-"\n"
-"J�su zin��anai, pirmais seri�lais ports (ko Microsoft Windows sauc par\n"
-"\"COM1\") Linux vid� tiek saukts par \"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 ""
-"Tagad j�s varat ievad�t iezvanpieejas opcijas. Ja j�s nezinat vai neesat\n"
-"p�rliecin�ts, ko ievad�t, pareizu inform�ciju var sa�emt no j�su Interneta\n"
-"pakalpojumu sniedz�ja. Ja j�s �eit neievad�t DNS (v�rdu servera) "
-"inform�ciju,\n"
-"�� inform�cija tiks ieg�ta no j�su Interneta pakalpojumu sniedz�ja\n"
-"piesl�g�an�s laik�."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Ja jums ir �r�js mod�ms, l�dzu iesl�dziet to un �aujiet DrakX to noteikt "
-"autom�tiski."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "L�dzu iesl�dziet j�su mod�mu un nor�diet pareizo modeli."
-
-#: ../../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 ""
-"Ja j�s neesat p�rliecin�ts, vai augst�k eso�� inform�cija ir pareiza, vai\n"
-"ar� j�s nezinat vai neesat p�rliecin�ts, ko ievad�t, pareizu inform�ciju\n"
-"var sa�emt no j�su Interneta pakalpojumu sniedz�ja. Ja j�s �eit neievad�t\n"
-"DNS (v�rdu servera) inform�ciju, �� inform�cija tiks ieg�ta no j�su\n"
-"Interneta pakalpojumu sniedz�ja piesl�g�an�s laik�."
-
-#: ../../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 ""
-"Tagad varat ievad�t j�su datora v�rdu, ja tas nepiecie�amas.\n"
-"Ja j�s to nezinat vai neesat p�rliecin�ts, ko ievad�t, pareizu inform�ciju\n"
-"var sa�emt no j�su Interneta pakalpojumu sniedz�ja."
-
-#: ../../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 ""
-"Tagad varat konfigur�t t�kla ier�ci.\n"
-"\n"
-"   * IP adrese: ja to nezinat vai neesat p�rliecin�ts, pajaut�jiet t�kla "
-"administratoram.\n"
-"     Jums nav j�ievada IP adrese, ja zem�k izv�laties \"Autom�tisks IP\".\n"
-"\n"
-"  - T�klamaska: \"255.255.255.0\" parasti ir laba izv�le. Ja nezinat vai "
-"neesat p�rliecin�ts, pajaut�jiet\n"
-"t�kla administratoram.\n"
-"\n"
-"  - Autom�tisks IP: ja j�su datort�kls izmanto BOOTP vai DHCP protokolu, "
-"izv�lieties �o opciju. Kad t� izv�l�ta,nnav j�nor�da \"IP addrese\". Ja "
-"nezinat vai neesat p�rliecin�ts, pajaut�jiet t�kla administratoram."
-
-#: ../../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 ""
-"Tagad varat ievad�t j�su datora v�rdu, ja tas nepiecie�amas.\n"
-"Ja j�s to nezinat vai neesat p�rliecin�ts, pajaut�jiet t�kla administratoram."
-
-#: ../../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 ""
-"Tagad varat ievad�t j�su datora v�rdu, ja tas nepiecie�ams.\n"
-"Ja nezinat vai neesat p�rliecin�ts, atst�jiet tuk�u."
-
-#: ../../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 ""
-"Tagad j�s varat ievad�t iezvan��an�s opcijas. Ja j�s nezinat, ko ievad�t,\n"
-"vajadz�go inform�ciju var sa�emt no j�su 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 ""
-"Ja j�s izmantosit proxy serverus, l�dzu konfigur�jiet tos. Ja j�s\n"
-"nezinat, vai izmantosit proxy, pajaut�jiet t�kla administratoram vai\n"
-"savam 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 ""
-"Ja j�su Interneta piesl�gums ir konfigur�ts pareizi, j�s varat instal�t\n"
-"kriptogr�fijas pakotnes. Vispirms nor�diet spogu�serveri, no kura\n"
-"iel�d�t pakotnes, tad izv�lieties instal�jam�s pakotnes.\n"
-"\n"
-"\n"
-"Atcerieties, ka spogu�serveris un kriptogr�fijas pakotnes ir j�izv�las\n"
-"atbilsto�i j�su valsts likumdo�anai."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Tagad varat nor�d�t laika joslu, kur� j�s dz�vojat."
-
-#: ../../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 laiku r��ina p�c GMT jeb \"Gr�ni�as Meridi�na Laika\" un p�rv�r�\n"
-"to par viet�jo laiku atbilsto�i j�su izv�l�tajai laika joslai.\n"
-"\n"
-"\n"
-"Ja �aj� dator� izmantojat ar� Microsoft Windows, izv�lieties \"N�\"."
-
-#: ../../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 ""
-"Tagad varat nor�d�t servisus, kurus j�s v�laties start�t sist�mas\n"
-"palai�anas laik�.\n"
-"\n"
-"\n"
-"Kad pele p�rvietojas p�r saraksta elementu, par�d�s\n"
-"neliels pal�dz�bas balons, kas paskaidro servisa lomu.\n"
-"\n"
-"\n"
-"Esiet �pa�i uzman�gs �aj� sol�, ja v�laties sist�mu izmantot ka serveri:\n"
-"iesp�jams, ka nev�laties start�t nevienu nevajadz�gu servisu. Atcerieties.\n"
-"ka da�i servisi var b�t b�stami, ja darbojas server�.\n"
-"Parasti izv�lieties tikai tos servisus, kas jums tie��m nepiecie�ami."
-
-#: ../../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 ""
-"J�s varat konfigur�t lok�lu printeri (kas piesl�gts j�su datoram) vai\n"
-"att�lu printeri (pieejami Unix, Netware vai Microsoft Windows t�kl�)."
-
-#: ../../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 ""
-"Ja j�s v�laties izmantot printeri, izv�lieties vienu no drukas sist�m�m - \n"
-"CUPS vai LRP.\n"
-"\n"
-"\n"
-"CUPS ir jauna, jaud�ga un elast�ga drukas sist�ma Unix sist�m�m (CUPS\n"
-"noz�m� \"Common Unix Printing System\"). �� ir noklus�t� Linux-Mandrake\n"
-"drukas sist�ma.\n"
-"\n"
 "\n"
-"LPR ir vec� drukas sist�ma, kas tika izmantota iepriek��j�s Linux-Mandrake\n"
-"versij�s.\n"
-"\n"
-"\n"
-"Ja jums nav printera, izv�lieties \"Neviens\"."
-
-#: ../../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\"."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"GNU/Linux var str�d�t ar da��diem printeru tipiem. Katram no �iem tipiem\n"
-"ir nepiecie�ama at��ir�gi uzst�d�jumi.\n"
-"\n"
-"\n"
-"Ja j�su printeris ir fiziski piesl�gts j�su datoram, izv�lieties \"Lok�ls\n"
-"printeris\".\n"
-"\n"
-"\n"
-"Ja j�s v�laties piek��t printerim, kas ir piesl�gts att�lam Microsoft\n"
-"Windows datoram (vai Unix datoram, kas izmanto SMB protokolu), izv�lieties\n"
-"\"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 ""
-"L�dzu iesl�dziet j�su printeri, pirms turpin�t un �aut DrakX to noteikt.\n"
-"\n"
-"�eit jums ir j�ievada noteikta inform�cija.\n"
-"\n"
-"\n"
-"   * Printera nosaukums: drukas spol�t�js izmanto \"lp\" k� noklus�to "
-"printera nosaukumu, t�p�c jums ir j�b�t\n"
-"     printerim, kas saucas \"lp\". Ja jums ir tikai viens printeris, j�s "
-"varat tam pie��irt vair�kus nosaukumus.\n"
-"     Nosaukumi ir j�atdala ar vertik�las sv�tras simbolu (\"|\"). T�d�j�di, "
-"ja j�s gribat izmantot saprotam�ku\n"
-"     nosaukumu, j�s to varat nor�d�t pirmo, piem�ram, \"Mans printeris|lp\". "
-"Printeris, kura nosaukum� ir \"lp\",\n"
-"     b�s noklus�tais printeris.\n"
-"\n"
-"\n"
-"   * Apraksts: nav oblig�ts, bet var noder�t, ja j�su datoram ir piesl�gti "
-"vair�ki printeri, vai ar� j�s gribat\n"
-"     at�aut citiem datoriem piesl�gties j�su printerim.\n"
-"\n"
-"\n"
-"   * Atra�an�s vieta: ja gribat, varat sniegt inform�ciju par j�su printera\n"
-"     atra�an�s vietu (�eit j�s varat rakst�t visu, ko v�laties, piem�ram,\n"
-"     \"otraj� st�v�\").\n"
 
-#: ../../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"
+"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"
-"   * 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"
+" * 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"
-"     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"
+" * \"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"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
-msgstr ""
-"�eit jums ir j�ievada noteikta inform�cija.\n"
-"\n"
-"\n"
-"   * Rindas nosaukums: drukas spol�t�js izmanto \"lp\" k� noklus�t� printera "
-"nosaukumu, t�p�c jums ir j�b�t\n"
-"     printerim, kas saucas \"lp\". Ja jums ir tikai viens printeris, j�s "
-"varat tam pie��irt vair�kus nosaukumus.\n"
-"     Nosaukumi ir j�atdala ar vertik�las sv�tras simbolu (\"|\"). T�d�j�di, "
-"ja j�s gribat izmantot saprotam�ku\n"
-"     nosaukumu, j�s to varat nor�d�t pirmo, piem�ram, \"Mans printeris|lp\". "
-"Printeris, kura nosaukum� ir \"lp\",\n"
-"     b�s noklus�tais printeris.\n"
-"\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
-"   * Spol��anas katalogs: tie�i �aj� katalog� tiek glab�ti drukas uzdevumi. "
-"Ja nezinat, ko ievad�t,\n"
-"     atst�jiet noklus�to v�rt�bu\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"
-"   * Printera piesl�gums: Ja j�su printeris fiziski ir piesl�gts j�su "
-"datoram, izv�lieties \"Lok�ls printeris\".\n"
-"     Ja j�s v�laties piek��t printerim, kas piesl�gts att�lam Unix datoram, "
-"izv�lieties \"Att�ls lpd printeris\".\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"
-"     Ja j�s v�laties izmantot printeri, kas piesl�gts att�lam Microsoft "
-"Windows datoram (vai Unix datoram, kas\n"
-"     izmanto SMB protokolu), izv�lieties \"SMB/Windows 95/98/NT\".\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"
-"     Ja j�s v�laties izmantot printeri, kas atrodas NetWare t�kl�, "
-"izv�lieties \"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 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 ""
-"J�su printeris nav atrasts. L�dzu ievadiet ier�ces nosaukumu, kurai tas ir\n"
-"piesl�gts.\n"
-"\n"
-"\n"
-"J�su zin��anai, vairums printeru ir piesl�gti pirmajam paral�lajam portam.\n"
-"�o portu GNU/Linux vid� sauc par \"/dev/lp0\" bet Microsoft Windows vid�\n"
-"par \"LPT1\"."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Tagad jums ir j�izv�l�s printeri no augst�k eso�� saraksta."
 
-#: ../../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 ""
-"L�dzu izv�lieties j�su printerim atbilsto�as opcijas.\n"
-"Izlasiet dokument�ciju, ja nezinat, ko izv�l�ties.\n"
-"\n"
-"\n"
-"N�kamaj� sol� j�s var�sit p�rbaud�t izv�l�to konfigur�ciju un izmain�t to,\n"
-"ja printeris nedarbosies pareizi."
-
-#: ../../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"
-"\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 ""
-"Tagad varat ievad�t j�su Linux-Mandrake sist�mas root paroli.\n"
-"Parole ir j�ievada divas reizes, lai p�rliecin�tos, ka abas kopijas\n"
-"sakr�t un j�s neesat k��d�jies.\n"
-"\n"
-"\n"
-"Root ir sist�mas administrators un vien�gais lietot�js, kam ir at�auts\n"
-"izmain�t sist�mas konfigur�ciju. �� iemesla d�� r�p�gi izv�lieties �o\n"
-"paroli! Neautoriz�ta root konta izmanto�ana var b�t �oti b�stama\n"
-"sist�mas integrit�tei, t�s datiem un cit�m tai piesl�gtaj�m sist�m�m.\n"
-"\n"
-"\n"
-"Parolei ir j�b�t vismaz 8 simbolus garai burtu un ciparu kombin�cijai.\n"
-"To nekad nevajadz�tu pierakst�t uz pap�ra.\n"
-"\n"
-"\n"
-"Neizv�lieties p�r�k garu vai sare���tu paroli: jums to ir\n"
-"j�sp�j atcer�ties bez p�r�k lielas piep�les."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Lai palielin�tu sist�mas dro��bu, izv�lieties \"Izmantot shadow failu\"\n"
-"un \"Izmantot MD5 paroles\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"Ja j�su t�kl� lieto NIS, izv�lieties \"Izmantot NIS\". Ja j�s to nezinat\n"
-"pajaut�jiet savam t�kla administratoram."
-
-#: ../../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"
-"\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 ""
-"Tagad j�s varat pievienot vienu vai vair�kus \"parastu\" lietot�ju\n"
-"kontus k� pretstatu \"privili��ta\" lietot�ja kontam root. Varat izveidot\n"
-"vienu vai vair�kus kontus katrai personai, kam b�s at�auts izmantot\n"
-"j�su datoru. Atcerieties, ka katram lietot�ja kontam ir sava\n"
-"konfigur�cija (grafisk� vide, programmu konfigur�cija un tml.) un savs\n"
-"\"m�jas katalogs\", kur� �� konfigur�cija tiek glab�ta.\n"
-"\n"
-"\n"
-"Vispirms izveidojiet kontu pats sev! Pat ja j�s b�sit vien�gais\n"
-"datora lietot�js, j�s NEDR�KSTAT ikdien� lietot root kontu: tas ir �oti\n"
-"liels dro��bas risks. �oti bie�i tikai da�i nepareizi nodruk�ti burti\n"
-"var padar�t j�su sist�mu nelietojamu.\n"
-"\n"
-"\n"
-"�� iemesla d�� jums j�iere�istr�jas sist�m�, izmantojot lietot�ja kontu,\n"
-"ko j�s t�l�t izveidosit, un j�iere�istr�jas k� root tikai administr��anas\n"
-"un uztur��anas uzdevumu veik�anai."
-
-#: ../../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 ""
-"Ir �oti ieteicams izveidot s�kn��anas disketi. Ja jums neizdosies start�t\n"
-"savu datoru, t� b�s vien�gais veids, k� to izgl�bt bez p�rinstal��anas."
-
-#: ../../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 ""
-"Jums ir j�nor�da, kur j�s v�laties novietot\n"
-"GNU/Linux s�kn��anai nepiecie�amo inform�ciju.\n"
-"\n"
-"\n"
-"Ja vien j�s neesat absol�ti p�rliecin�ts par savu r�c�bu,\n"
-"izv�lieties \"Diska pirmais sektors (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 ""
-"Ja vien j�s neesat p�rliecin�ts par citu izv�li, parasti ir j�izv�las\n"
-"\"/dev/hda\" (prim�rais galvenais IDE disks) vai \"/dev/sda\" (pirmais\n"
-"SCSI disks)."
-
-#: ../../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) un Grub ir s�kn�t�ji: tie sp�j s�kn�t GNU/Linux\n"
 "vai jebkuru citu oper�t�jsist�mu, kas ir uzst�d�ta j�su dator�.\n"
@@ -3395,377 +3074,261 @@ msgstr ""
 "un �aj� gad�jum� j�s varat izdz�st attiec�gos ierakstus. Bet �aj�\n"
 "gad�jum� jums b�s nepiecie�ama s�kn��anas diskete, lai t�s s�kn�tu!"
 
-#: ../../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"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"Jums ir j�nor�da, kur j�s v�laties novietot\n"
+"GNU/Linux s�kn��anai nepiecie�amo inform�ciju.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
 "\n"
+"Ja vien j�s neesat absol�ti p�rliecin�ts par savu r�c�bu,\n"
+"izv�lieties \"Diska pirmais sektors (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 un grub galven�s opcijas ir:\n"
-"  - S�kn��anas ier�ce: Nor�da ier�ces nosaukumu (t.i., ciet� diska\n"
-"sada�u), uz kuras atrodas s�kn��anas sektors. Ja vien neesat\n"
-"p�rliecin�ts par ko citu, izv�lieties \"/dev/hda\".\n"
+"DrakX m��in�s samekl�t PCI SCSI adapteri(us).\n"
+"Ja DrakX atrad�s k�du SCSI adapteri un zin�s, kuru draiveri izmantot,\n"
+"tas tiks instal�ts autom�tiski.\n"
 "\n"
+"Ja jums nav SCSI adapteru, ir ISA SCSI adapteris vai PCI SCSI adapteris,\n"
+"ko DrakX neatpaz�st, jums tiks pajaut�ts, vai j�su sist�m� ir SCSI\n"
+"adapteris. Ja nav SCSI adapteru, j�s varat vienk�r�i izv�l�ties 'N�'.\n"
+"Ja j�s izv�laties 'J�', jums tiks par�d�ts draiveru saraksts, kur�\n"
+"varat izv�l�ties vajadz�go adapteri.\n"
 "\n"
-"  - Pauze pirms noklus�t� att�la s�kn��anas: Nor�da laiku sekundes\n"
-"desmitda��s, ko s�kn�t�js gaida pirms pirm� att�la iel�des.\n"
-"Tas ir ieteicams sist�m�m, kas s�kn�jas tie�i no ciet� diska t�l�t p�c\n"
-"tastat�ras aktiviz��anas. S�kn��ana s�kas bez pauzes, ja \"pauze\" nav\n"
-"nor�d�ta vai ir nulle.\n"
 "\n"
+"Ja jums nepiecie�ams patst�v�gi nor�d�t adapteri, DrakX pajaut�s, vai\n"
+"v�laties nor�d�t adaptera opcijas. Jums b�tu j��auj DrakX aptauj�t\n"
+"dzel�us un noskaidrot opcijas. Parasti tas izdodas bez probl�m�m.\n"
 "\n"
-"  - Video re��ms: Tas nor�da VGA teksta re��mu, kas tiek izv�l�ts\n"
-"s�kn��anas laik�. Ir pieejamas sekojo�as v�rt�bas: \n"
-"    * norm�ls: izv�las norm�lu 80x25 teksta re��mu.\n"
-"    * <skaitlis>:  izmanto atbilsto�u teksta re��mu."
+"Ja neizdodas, jums patst�v�gi j�nor�da draivera opcijas.\n"
+"Izlasiet Instal��anas rokasgr�matu (3. noda�u, apak�noda�u \"Inform�cijas "
+"sav�k�ana par j�su dzel�iem\"), lai uzzin�tu, k� ieg�t �o\n"
+"inform�ciju no dzel�u dokument�cijas, ra�ot�ja t�kla lapas\n"
+"(ja jums ir pieejams Internets) vai Windows (ja tas ir uzst�d�ts j�su "
+"dator�)."
 
-#: ../../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"
-"\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"
+"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"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\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"
-"\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"
-"\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 ir s�kn�t�js SPARC sist�m�m: tas sp�j s�kn�t GNU/Linux\n"
-"vai jebkuru citu oper�t�jsist�mu, kas ir uzst�d�ta j�su dator�.\n"
-"Parasti citas oper�t�jsist�mas tiek korekti noteiktas un instal�tas.\n"
-"Ja t� nenotiek, j�s �aj� ekr�n� varat ar roku pievienot ierakstu. Esiet\n"
-"uzman�gs, izv�loties pareizus parametrus.\n"
-"\n"
-"\n"
-"J�s varb�t ar� v�laties ne�aut nevienam piek��t p�r�j�m oper�t�jsist�m�m,\n"
-"un �aj� gad�jum� j�s varat izdz�st attiec�gos ierakstus. Bet �aj�\n"
-"gad�jum� jums b�s nepiecie�ama s�kn��anas diskete, lai t�s s�kn�tu!"
 
-#: ../../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 galven�s opcijas ir:\n"
-"  - S�kn�t�ja instal��ana: Nor�da, kur j�s v�laties novietot inform�ciju,\n"
-"kas nepiecie�ama GNU/Linux s�kn��anai. Ja vien neesat p�rliecin�ts\n"
-"par ko citu, izv�lieties \"Diska pirmais sektors (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"
-"  - Pauze pirms noklus�t� att�la s�kn��anas: Nor�da laiku sekundes\n"
-"desmitda��s, ko s�kn�t�js gaida pirms pirm� att�la iel�des.\n"
-"Tas ir ieteicams sist�m�m, kas s�kn�jas tie�i no ciet� diska t�l�t p�c\n"
-"tastat�ras aktiviz��anas. S�kn��ana s�kas bez pauzes, ja \"pauze\" nav\n"
-"nor�d�ta vai ir nulle."
-
-#: ../../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 ""
-"Ir pien�cis laiks konfigur�t X Window System, kas ir GNU/Linux GUI\n"
-"(grafisk� lietot�ja interfeisa) pamats. Lai to izdar�tu, jums ir\n"
-"j�konfigur� video karte un monitors. Tom�r vairums no �iem so�iem ir\n"
-"automatiz�ti, t�p�c j�su uzdevums var b�t tikai p�rbaud�t izdar�to\n"
-"izv�li un apstiprin�t parametrus :)\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"
-"Kad konfigur��ana ir pabeigta, tiks start�ts X (ja vien j�s\n"
-"nel�dzat DrakX to nedar�t), lai j�s p�rbaud�tu un apskat�tu, vai\n"
-"parametri j�s apmierina. Ja tie neder, j�s varat atgriezties un tos\n"
-"nomain�t tik reizes, cik b�s nepiecie�ams."
-
-#: ../../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 ""
-"Ja ar X konfigur�ciju kaut kas nav k�rt�b�, izmantojiet ��s opcijas,\n"
-"lai pareizi konfigur�tu 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 ""
-"Ja dodat priek�roku darba uzs�k�anai grafisk� re��m�, izv�lietis \"J�\",\n"
-"cit�di izv�lieties \"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 ""
+"Nor�diet cieto disku, ko v�laties izdz�st, lai izveidotu jaunu\n"
+"Mandrake Linux part�ciju. Esiet uzman�gi, jo visi disk� eso�ie dati\n"
+"pazud�s un neb�s atjaunojami."
 
-#: ../../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�su sist�ma tiks p�rstart�ta.\n"
+"Nospiediet \"Labi\", ja v�laties izdz�st visus datus un\n"
+"part�cijas, kas atrodas uz �� ciet� diska. Esiet uzman�gi, p�c \"Labi\" "
+"nospie�anas j�s nevar�sit atjaunot nek�dus datus vai part�cijas, kas "
+"atrad�s\n"
+"uz diska, taj� skait� ar� Windows datus.\n"
 "\n"
-"P�c p�rstart��anas j�su jaun� Linux Mandrake sist�ma tiks iel�d�ta\n"
-"autom�tiski. Ja v�laties s�kn�t k�du citu jau uzst�d�tu oper�t�jsist�mu,\n"
-"l�dzu izlasiet papildus nor�d�jumus."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Valodas izv�le"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Instal��anas klases izv�le"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Ciet� diska noteik�ana"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Peles konfigur��ana"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Tastat�ras izv�le"
+"\n"
+"Nospiediet \"Atcelt\", lai atceltu �o oper�ciju bez jebk�du uz �� diska "
+"eso�u datu vai part�ciju pazaud��anas."
 
-#: ../../install2.pm_.c:42
-msgid "Security"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
 
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Failu sist�mu uzst�d��ana"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Diska format��ana"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Instal�jamo pakot�u izv�le"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Sist�mas instal��ana"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "root paroles izv�le"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Lietot�ju pievieno�ana"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "T�kla konfigur��ana"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Kopsavilkums"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Servisu konfigur��ana"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Sist�mdisketes rad��ana"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "S�kn�t�ja instal��ana"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "X konfigur��ana"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Instal��anas beigas"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3780,20 +3343,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 ""
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Ielieciet FAT format�tu disketi iek�rt� %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''"
@@ -3801,30 +3364,20 @@ msgstr ""
 "Lai izmantotu �o saglab�to pakot�u izv�li, palaidiet instal�ciju ar ``linux "
 "defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "K��da nolasot failu $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "K��da, nolasot failu %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 "Labi"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "L�dzu notest�jiet peli"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Lai aktiviz�tu peli,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "PAKUSTINIET RITENI!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3834,92 +3387,97 @@ msgstr ""
 "Da�u j�su datora dzel�u darb�bai nepiecie�ami ``firmas'' draiveri.\n"
 "Papildus inform�ciju varat atrast �eit: %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"
 "Then choose action ``Mount point'' and set it to `/'"
 msgstr ""
-"Jums ir nepiecie�ama saknes sada�a.\n"
-"�im nol�kam izveidojiet sada�u (vai uzklik��iniet uz jau eso�as).\n"
+"Jums ir nepiecie�ama saknes part�cija.\n"
+"�im nol�kam izveidojiet part�ciju (vai uzklik��iniet uz jau eso�as).\n"
 "Tad izv�lieties darb�bu ``Mont��anas punkts'' un nor�diet, ka tas ir `/'"
 
-#: ../../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 "Jums ir nepiecie�ama swap sada�a"
+msgstr "Jums ir nepiecie�ama swap part�cija"
 
-#: ../../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 ""
-"Jums nav swap sada�as\n"
+"Jums nav swap part�cijas\n"
 "\n"
 "Vai tom�r turpin�t?"
 
-#: ../../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 "Jums ir nepiecie�ama swap part�cija"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Izmantot br�vo vietu"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
-msgstr "Nepietiek br�vas vietas, lai izvietotu jaunas sada�as"
+msgstr "Nepietiek br�vas vietas, lai izvietotu jaunas part�cijas"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
-msgstr "Izmantot jau eso�u sada�u"
+msgstr "Izmantot jau eso�u part�ciju"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
-msgstr "Nav nevienas sada�as, ko var�tu izmantot"
+msgstr "Nav nevienas part�cijas, ko var�tu izmantot"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
-msgstr "Izmantot Windows sada�u priek� loopback"
+msgstr "Izmantot Windows part�ciju priek� loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
-msgstr "Kuru sada�u v�laties izmantot priek� Linux4Win?"
+msgstr "Kuru part�ciju v�laties izmantot priek� Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Izv�lieties izm�rus"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
-msgstr "Saknes sada�as izm�rs (MB): "
+msgstr "Saknes part�cijas izm�rs (MB): "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
-msgstr "Swap sada�as izm�rs (MB): "
+msgstr "Swap part�cijas izm�rs (MB): "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
-msgstr "Izmantot Windows sada�as br�vo vietu"
+msgstr "Izmantot Windows part�cijas br�vo vietu"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
-msgstr "Kuras sada�as izm�ru v�laties izmain�t?"
+msgstr "Kuras part�cijas izm�ru v�laties izmain�t?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Izskait�oju Windows failu sist�mas robe�as"
 
-#: ../../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 izm�ra main�t�js nesp�j izmain�t j�su sada�u,\n"
+"FAT izm�ra main�t�js nesp�j izmain�t j�su part�ciju,\n"
 "atkl�ta sekojo�a k��da: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
-msgstr "Windows sada�a ir p�r�k fragment�ta, vispirms palaidiet ``defrag''"
+msgstr "Windows part�cija ir p�r�k fragment�ta, vispirms palaidiet ``defrag''"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3931,60 +3489,60 @@ msgid ""
 msgstr ""
 "BR�DIN�JUMS!\n"
 "\n"
-"Tagad DrakX izmain�s Windows sada�as izm�ru. Esiet uzman�gs: �� darb�ba\n"
+"Tagad DrakX izmain�s Windows part�cijas izm�ru. Esiet uzman�gs: �� darb�ba\n"
 "ir b�stama. Ja j�s to v�l neesat izdar�jis, jums vispirms ir j�p�rtrauc\n"
 "instal��ana, no Windows j�palai� scandisk (ieteicams palaist ar� defrag),\n"
 "tad atk�rtoti j�s�k instal��ana. Vajadz�tu izveidot ar� datu rezerves\n"
 "kopiju. Kad esat p�rliecin�ts, nospiediet Labi."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "K�du apjomu v�laties atst�t priek� windows uz"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
-msgstr "sada�a %s"
+msgstr "part�cija %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT izm�ra mai�a neizdev�s: %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 ""
-"Nav FAT sada�u, lai izmain�to to izm�ru vai izmantotu k� loopback (vai "
+"Nav FAT part�ciju, lai izmain�to to izm�ru vai izmantotu k� loopback (vai "
 "nepietiek br�vas vietas)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Izdz�st visu disku"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "No�emt 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 "Jums ir vair�k nek� viens cietais disks, uz kura j�s instal�jat 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 "VISAS diska %s sada�as un taj�s eso�ie dati tiks pazaud�ti"
+msgstr "VISAS diska %s part�cijas un taj�s eso�ie dati tiks pazaud�ti"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Piel�gots disku sadal�jums"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Izmantot fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3993,28 +3551,28 @@ msgstr ""
 "Tagad j�s varat sadal�t diska iek�rtu %s.\n"
 "Kad esat pabeigu�i, neaizmirstiet saglab�t, izmantojot `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
-msgstr "J�su Windows sada�� nav pietieko�i daudz br�vas vietas"
+msgstr "J�su Windows part�cij� nav pietieko�i daudz br�vas vietas"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "Nevaru atrast vietu instal��anai"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "DrakX sada�u veido�anas meistars atrada sekojo�us risin�jumus:"
+msgstr "DrakX part�ciju veido�anas meistars atrada sekojo�us risin�jumus:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Diska sadal��ana neizdev�s: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Iedarbinu t�klu"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Atsl�dzu t�klu"
 
@@ -4026,12 +3584,12 @@ msgstr ""
 "Atkl�ta k��da, bet es nezinu, k� ar to pareizi apieties.\n"
 "Turpiniet, ja v�laties risk�t."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Dubl�ts mont��anas punkts %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"
@@ -4043,16 +3601,16 @@ msgstr ""
 "Parbaudiet disku uz instal�ta datora, izmantojot komandu \"rpm -qpl Mandrake/"
 "RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "J�s sveic %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Nav nevienas diske�u iek�rtas"
 
-#: ../../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"
@@ -4066,32 +3624,32 @@ msgstr "Nor�diet apjomu, ko v�laties instal�t"
 msgid "Total size: "
 msgstr "Kop�jais izm�rs: "
 
-#: ../../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 "Versija: %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 "Apjoms: %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 "Izv�lieties pakotnes, ko v�laties instal�t"
 
-#: ../../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 "Instal�t"
 
-#: ../../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 "Instal�ju"
 
@@ -4099,7 +3657,7 @@ msgstr "Instal�ju"
 msgid "Please wait, "
 msgstr "L�dzu uzgaidiet, "
 
-#: ../../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 "Atliku�ais laiks"
 
@@ -4108,21 +3666,21 @@ msgid "Total time "
 msgstr "Kop�jais laiks"
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Sagatavoju instal��anu"
 
-#: ../../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 "Instal�ju pakotni %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 "Tom�r turpin�t?"
 
-#: ../../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 "Pakot�u k�rto�anas laik� atkl�ta k��da:"
 
@@ -4130,29 +3688,33 @@ msgstr "Pakot�u k�rto�anas laik� atkl�ta k��da:"
 msgid "Use existing configuration for X11?"
 msgstr "Vai izmantot jau eso�o X11 konfigur�ciju?"
 
-#: ../../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�su sist�mai tr�kst resursu. Linux-Mandrake instal��anas laik� var\n"
+"J�su sist�mai tr�kst resursu. Mandrake Linux instal��anas laik� var\n"
 "rasties probl�mas. Ja t� notiek, varat pam��in�t teksta instal��anu.\n"
 "Lai to izdar�tu, nospiediet`F1', ka notiek iel�de no CDROM, tad ievadiet\n"
 "`text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Instal��anas klase"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "L�dzu izv�lieties vienu no sekojo��m instal��anas klas�m:"
 
-#: ../../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 "Kop�jais j�su izv�l�to grupu izm�rs ir aptuveni %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"
@@ -4167,7 +3729,7 @@ msgstr ""
 "Zems procentu l�menis instal�s tikai vissvar�g�k�s pakotnes;\n"
 "100% l�men� tiks instal�tas visas izv�l�t�s pakotnes."
 
-#: ../../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"
@@ -4183,84 +3745,68 @@ msgstr ""
 "daudzumu. Zems procentu l�menis instal�s tikai vissvar�g�k�s pakotnes;\n"
 "%d%% l�menis instal�s tik daudz pakot�u, cik ir iesp�jams."
 
-#: ../../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 "N�kamaj� sol� j�s var�sit izv�l�ties daudz prec�z�k."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Instal�jamo pakot�u procentu�lais daudzums"
 
-#: ../../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 "Pakot�u grupu izv�le"
 
-#: ../../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 "Atsevi��u pakot�u izv�le"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Izv�rst koku"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Sak�aut koku"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Sak�rtots vien� sarakst� vai pa grup�m"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Kop�jais izm�rs: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Slikta pakotne"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nosaukums: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Svar�gums: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Kop�jais izm�rs: %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 ""
 "J�s nevarat izv�l�ties �o pakotni, jo nepietiek vietas t�s instal��anai"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Tiks instal�tas sekojo�as pakotnes"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Tiks no�emtas sekojo�as pakotnes"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "J�s varat izv�l�ties/atteikties no ��s pakotnes"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "�� ir oblig�ta pakotne, no t�s nevar atteikties"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "J�s nevarat atteikties no ��s pakotnes. T� jau ir instal�ta"
 
-#: ../../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?"
@@ -4268,24 +3814,43 @@ msgstr ""
 "�o pakotni ir nepiecie�ams uzlabot\n"
 "Vai tie��m v�laties atteikties no t�s?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "J�s nevarat atteikties no ��s pakotnes. To ir nepiecie�ams uzlabot"
 
-#: ../../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 "Saglab�t disket�"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "Saglab�t pakot�u izv�li"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "Instal��anas beigas"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Apr��inu"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "L�dzu gaidiet, gatavoju instal�ciju"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d pakotnes"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4344,15 +3909,15 @@ msgstr ""
 "attiec�gajiem autoriem, un t�s aizsarg� intelektu�l� �pa�uma un\n"
 "autorties�bu likumi, kas attiecas uz programnodro�in�jumu.\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 "Pie�emt"
 
-#: ../../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 "Noraid�t"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4366,7 +3931,7 @@ msgstr ""
 "L�dzu ielieciet iek�rt� Cd-Rom \"%s\", kad tas ir izdar�ts, nospiediet Labi\n"
 "Ja jums nav �� diska, nospiediet Atcelt, lai neinstal�tu no �� Cd-Rom."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Pakot�u instal��anas laik� atkl�ta k��da:"
 
@@ -4374,34 +3939,21 @@ msgstr "Pakot�u instal��anas laik� atkl�ta k��da:"
 msgid "An error occurred"
 msgstr "Atkl�ta k��da"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "L�dzu izv�lieties izmantojamo valodu."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "J�s varat izv�l�ties citas valodas, kas b�s pieejamas p�c instal��anas"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Viss"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Licences l�gums"
 
-#: ../../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"
@@ -4455,7 +4007,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"
@@ -4492,7 +4044,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"
@@ -4512,103 +4064,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 "Tastat�ra"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "L�dzu izv�lieties j�su tastat�ras izk�rtojumu."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "�eit ir pilns pieejamo tastat�ru saraksts"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Instal��anas klase"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Kuru instal��anas klasi v�laties?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Instal�t/Atjaunin�t"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "�� ir instal��ana vai atjaunin��ana?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Ieteicama"
 
-#: ../../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 "Eksperta"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Atjaunin�t"
 
-#: ../../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 "L�dzu izv�lieties j�su peles tipu."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Peles ports"
 
-#: ../../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 "L�dzu izv�lieties, kuram seri�lajam portam ir piesl�gta pele."
 
-#: ../../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 "Konfigur�ju PCMCIA kartes..."
 
-#: ../../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 "Konfigur�ju 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 "nav pieejamu sada�u"
+msgstr "nav pieejamu part�ciju"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
-msgstr "P�rmekl�ju sada�as, lai atrastu mont��anas punktus"
+msgstr "P�rmekl�ju part�cijas, lai atrastu mont��anas punktus"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Izv�lieties mont��anas punktus"
 
-#: ../../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,91 +4166,132 @@ msgid ""
 "\n"
 "Do you agree to loose all the partitions?\n"
 msgstr ""
-"Neizdev�s nolas�t diska sada�u tabulu, jo t� bija p�r�k stipri boj�ta :(\n"
-"Sist�ma var m��in�t atsl�gts slikt�s sada�as (VISI DATI pazud�s!).\n"
-"Otrs risin�jums ir aizliegt DrakX izmain�t sada�u tabulu.\n"
+"Neizdev�s nolas�t diska part�ciju tabulu, jo t� bija p�r�k stipri boj�ta :(\n"
+"Sist�ma var m��in�t atsl�gts slikt�s part�cijas (VISI DATI pazud�s!).\n"
+"Otrs risin�jums ir aizliegt DrakX izmain�t part�ciju tabulu.\n"
 "(k��da ir %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!"
 msgstr ""
-"DiskDrake neizdev�s pareizi nolas�t sada�u tabulu.\n"
+"DiskDrake neizdev�s pareizi nolas�t part�ciju tabulu.\n"
 "Turpiniet, ja v�laties risk�t!"
 
-#: ../../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 "Izv�lieties part�cijas, ko v�laties format�t"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
-msgstr "Saknes sada�a"
+msgstr "Saknes part�cija"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
-msgstr "Kura ir j�su sist�mas saknes sada�a (/)?"
+msgstr "Kura ir j�su sist�mas saknes part�cija (/)?"
 
-#: ../../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 "Lai sada�u tabulas izmai�as st�tos sp�k�, jums j�p�rstart� dators"
+msgstr "Lai part�ciju tabulas izmai�as st�tos sp�k�, jums j�p�rstart� dators"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
-msgstr "Izv�lieties sada�as, ko v�laties format�t"
+msgstr "Izv�lieties part�cijas, ko v�laties format�t"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "P�rbaud�t sliktos blokus?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
-msgstr "Format�ju sada�as"
+msgstr "Format�ju part�cijas"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Veidoju un format�ju failu %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Instal��anas pabeig�anai nepietiek swap, palieliniet swap"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Mekl�ju pieejam�s pakotnes"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Mekl�ju uzlabojam�s pakotnes"
 
-#: ../../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 ""
 "J�su sist�m� vairs nav br�vas vietas instal��anai vai uzlabo�anai (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Pilna (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minim�la (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Ieteicama (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Piel�gota"
 
-#: ../../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 "Atjanot no disketes"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Loading from floppy"
+msgstr "Atjanot no disketes"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Package selection"
+msgstr "Pakot�u grupu izv�le"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "Ielieciet disketi iek�rt� %s"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Saglab�t disket�"
+
+#: ../../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"
@@ -4712,12 +4301,12 @@ msgstr ""
 "Ja jums nav neviena no nor�d�tajiem CD, nospiediet Atcelt.\n"
 "Ja tr�kst tikai da�u CD, sarakst� atsl�dziet tos un nospiediet Labi."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ar nosaukumu \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4726,11 +4315,21 @@ msgstr ""
 "Instal�ju pakotni %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "P�cinstal��anas konfigur��ana"
 
-#: ../../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 "Ielieciet disketi iek�rt� %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Ielieciet tuk�u disketi iek�rt� %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4797,95 +4396,142 @@ 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 "Izv�lieties spogu�serveri, no kura �emt pakotnes"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Piesl�dzos spogu�serverim, lai sa�emtu pieejamo pakot�u sarakstu"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "L�dzu izv�lieties pakotnes, ko v�laties instal�t"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "K�da ir j�su laika josla?"
 
-#: ../../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 "Vai datora pulkstenis r�da GMT laiku?"
 
-#: ../../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 serveris"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Att�ls CUPS serveris"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Nav printera"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Kopsavilkums"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Pele"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Laika josla"
 
-#: ../../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 "Printeris"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 #, fuzzy
 msgid "ISDN card"
 msgstr "Iek��ja ISDN karte"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 #, fuzzy
 msgid "Sound card"
 msgstr "Standarta"
 
-#: ../../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 "Kuru druk��anas sist�mu v�laties izmantot?"
+#: ../../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 "Izmantot NIS"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+#, fuzzy
+msgid "Local files"
+msgstr "Lok�ls printeris"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "root paroles izv�le"
+
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Bez paroles"
 
-#: ../../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 "�� parole ir p�r�k vienk�r�a (j�b�t vismaz %d simbolus garai)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Izmantot NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autentifik�cija"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "dzelten�s lapas"
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "Autentifik�cija"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:951
+#, fuzzy
+msgid "LDAP Server"
+msgstr "serveris"
+
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "Autentifik�cijas NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS dom�ns"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "NIS serveris"
 
-#: ../../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 "
@@ -4912,19 +4558,19 @@ msgstr ""
 "Ja v�laties izveidot j�su sist�mai piel�gotu s�kn��anas disketi,\n"
 "ielieciet sisketi pirmaj� iek�rt� un nospiediet \"Labi\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Pirm� diske�u iek�rta"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Otr� diske�u iek�rta"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Izlaist"
 
-#: ../../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 "
@@ -4945,84 +4591,95 @@ msgstr ""
 "atvieglojot atjauno�anu p�c smagiem sist�mas boj�jumiem. Vai v�laties\n"
 "izveidot j�su sist�mai piel�gotu s�kn��anas disketi?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Diem��l nav pieejama neviena diske�u iek�rta"
 
-#: ../../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 "Nor�diet diske�u iek�rtu, ko izmanto distetes veido�anai"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Ielieciet disketi iek�rt� %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Gatavoju s�kn��anas disketi"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Sagatavoju s�kn�t�ju"
 
-#: ../../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 "Vai v�laties izmantot 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?"
 msgstr ""
 "K��da, instal�jot aboot, \n"
-"vai instal�t piespiedu k�rt� pat tad, ja tiks izn�cin�ta pirm� sada�a?"
+"vai instal�t piespiedu k�rt� pat tad, ja tiks izn�cin�ta pirm� part�cija?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "S�kn�t�ja instal��ana"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "S�kn�t�ja instal��ana neizdev�s. Atkl�ta ��da k��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 "Zems"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Vid�js"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Augsts"
 
-#: ../../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 "Izv�lieties dro��bas l�meni?"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "Vai v�laties izveidot auto instal��anas disketi linux replik�cijai?"
-
-#: ../../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 "Ielieciet tuk�u disketi iek�rt� %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 "Sagatavoju auto instal��anas disketi"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5032,34 +4689,34 @@ msgstr ""
 "\n"
 "Vai tie��m v�laties iziet t�l�t?"
 
-#: ../../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 ""
 "Apsveicam, instal��ana ir pabeigta.\n"
 "Iz�emiet s�kn��anas datu nes�ju un nospiediet ievadu, lai p�rstart�tu "
 "datoru.\n"
 "\n"
-"Lai sa�emtu inform�ciju par labojumiem, kas ir pieejami �im Linux-Mandrake\n"
+"Lai sa�emtu inform�ciju par labojumiem, kas ir pieejami �im Mandrake Linux\n"
 "izdevumam, skatiet Errata failu, kas atrodams http://www.linux-mandrake."
 "com/.\n"
 "\n"
 "Inform�cija par j�su sist�mas konfigur��anu ir pieejama Ofici�l�s\n"
-"Linux-Mandrake rokasgr�matas p�cinstal��anas noda��."
+"Mandrake Linux rokasgr�matas p�cinstal��anas noda��."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Sagatavot auto instal��anas disketi"
 
-#: ../../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"
@@ -5068,42 +4725,59 @@ 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 "Autom�tisks"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Atk�rtot"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Saglab�t pakot�u izv�li"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake instal��ana %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux instal��ana %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> p�riet | <Space> izv�l�ties | <F12> uz n�kamo ekr�nu"
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 #, fuzzy
 msgid "kdesu missing"
 msgstr "atmest"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Izv�lieties darb�bu"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Izv�rsta"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "L�dzu uzgaidiet"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Izv�rst koku"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Sak�aut koku"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Sak�rtots vien� sarakst� vai pa grup�m"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5129,268 +4803,292 @@ msgstr "J�su izv�le? (noklus�ti %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "J�su izv�le? (noklus�ti %s  ievadiet `none', ja nav) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "�ehijas (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 "V�cijas"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvoraka"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "Sp�nijas"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Somijas"
 
-#: ../../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 "Francijas"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norv��ijas"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Polijas"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Krievijas"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Zviedrijas"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Apvienot�s Karalistes"
 
-#: ../../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 "ASV tastat�ra"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "Ir�nas"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Arm�nijas (vec�)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Arm�nijas (rakst�mma��na)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Arm�nijas (fon�tisk�)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaid��nas (lat��u)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaid��nas (kirilica)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Be��ijas"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bulg�rijas"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Braz�lijas (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Baltkrievijas"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "�veices (v�cu izvietojums)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "�veices (fran�u izvietojums)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "�ehijas (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "�ehijas (programm�t�ju)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "V�cijas (bez m�majiem tausti�iem)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "D�nijas"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvoraka (US)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvoraka (Norv��ijas)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Igaunijas"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruzijas (\"krievu\" izvietojums)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruzijas (\"lat��u\" izvietojums)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Grie�ijas"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Ung�rijas"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Horv�tijas"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Izra�las"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Izra�las (fon�tisk�)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Ir�nas"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Islandes"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "It�lijas"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Jap�nas 106 taisti�i"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 #, fuzzy
 msgid "Korean keyboard"
 msgstr "Apvienot�s Karalistes"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Lat��amerikas"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Ma�edonijas"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "D�nijas"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lietuvas AZERTY (vec�)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lietuvas AZERTY (jaun�)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lietuvas \"numuru rinda\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lietuvas \"fon�tisk�\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Atra�an�s vieta"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Ma�edonijas"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "D�nijas"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Polijas (qwerty izvietojums)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Polijas (qwertz izvietojums)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portug�les"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kan�das (Kvebeka)"
 
-#: ../../keyboard.pm_.c:193
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "Krievijas (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Zviedrijas"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "Krievijas (Yawerty)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "Krievijas (Yawerty)"
+
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Slov�nijas"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slov�kijas (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slov�kijas (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Slov�kijas (programm�t�ju)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbaid��nas (kirilica)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Tai tastat�ra"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Tai tastat�ra"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turcijas (tradicion�lais \"F\" modelis)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turcijas (modernais \"Q\" modelis)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukrainas"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "ASV tastat�ra (starptautisk�)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vjetnamas \"numuru rinda\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Dienvidsl�vijas (lat��u/kirilicas)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Cikliski mont��anas punkti %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr ""
 
@@ -5503,171 +5201,221 @@ msgstr "neviens"
 msgid "No mouse"
 msgstr "Nav peles"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "L�dzu notest�jiet peli"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Lai aktiviz�tu peli,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "PAKUSTINIET RITENI!"
+
+#: ../../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 "Somijas"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "T�l�k ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Atpaka�"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Vai tas ir pareizi?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Interneta konfigur�cija"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Piesl�gties Internetam"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Vai v�laties m��in�t piesl�gties internetam t�l�t?"
+#: ../../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 ""
+"Parast�kais veids, k� piesl�gties ar adsl, ir pppoe.\n"
+"Da�i piesl�gumi izmanto pptp, pavisam nedaudzi dhcp.\n"
+"Ja j�s nezinat, izv�lieties 'izmantot pppoe'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Izm��inu piesl�gumu..."
+#: ../../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 "Sist�ma pa�laik ir piesl�gta Internetam."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "izmantot dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr ""
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "izmantot pppoe"
+
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "izmantot 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 ""
-"��iet, ja j�su sist�mu nav piesl�gta Internetam.\n"
-"M��iniet p�rkonfigur�t piesl�gumu."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "T�kla konfigur�cija"
-
-#: ../../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 konfigur�cija"
+"Kuru dhcp klientu v�laties izmantot?\n"
+"Noklus�ti ir 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 ""
-"Izv�lieties pakalpojumu sniedz�ju.\n"
-" Ja tas nav �aj� sarakst�, izv�lietis Nav sarakst�"
+"J�su sist�m� nav atrasts neviens ethernet t�kla adapteris.\n"
+"Nevaru uzst�d�t �o piesl�guma veidu."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Savienojuma konfigur��ana"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Izv�lieties t�kla interfeisu"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "L�dzu aizpieldiet vai izv�lietis lauku"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"L�dzu nor�diet, kuru t�kla adapteri v�laties izmantot Interneta piesl�gumam."
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "Kartes IRQ"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "t�kla karte nav atrasta"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Kartes mem (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Konfigur�ju t�klu"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "Kartes 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 ""
+"L�dzu ievadiet j�su resursa v�rdu, ja to zinat.\n"
+"Da�u DHCP serveru darb�bai ir nepiecie�ams resursa v�rds.\n"
+"Resursa v�rdam ir j�b�t pilnam kvalific�tam resursa v�rdam,\n"
+"piem�ram, ``mybox.mylab.myco.com''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "Kartes IO_0"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Resursa v�rds:"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "Kartes 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 "T�kla konfigur��anas meistars"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "J�su priv�tais telefona numurs"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "�r�js ISDN mod�ms"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Pakalpojumu sniedz�ja nosaukums (piem., provider.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Iek��ja ISDN karte"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Pakalpojumu sniedz�ja telefona numurs"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "K�ds ir j�su ISDN piesl�guma veids?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Pakalpojumu sniedz�ja 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 "Pakalpojumu sniedz�ja dns 2"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "Tika atkl�ta ugunsm�ra konfigur�cija!"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Zvan��anas re��ms"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "Tika atkl�ta ugunsm�ra konfigur�cija!"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Konta nosaukums (lietot�ja v�rds)"
+#: ../../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 konfigur�cija"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Konta parole"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Izv�lieties pakalpojumu sniedz�ju.\n"
+" Ja tas nav �aj� sarakst�, izv�lietis Nav sarakst�"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Eiropa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Protokols"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Eiropa (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 "Citur pasaul�"
 
-#: ../../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 ""
 "Citur pasaul� \n"
 " nav D-Channel (izdal�tas l�nijas)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "K�du protokolu v�laties izmantot?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "K�ds ir j�su kartes tips?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Nezinu"
 
-#: ../../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"
@@ -5679,19 +5427,19 @@ msgstr ""
 "\n"
 "Ja jums ir PCMCIA karte, jums ir j�zina kartes irq un io.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "P�rtraukt"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Turpin�t"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Kura ir j�su ISDN karte ?"
 
-#: ../../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."
@@ -5699,110 +5447,62 @@ msgstr ""
 "Ir atkl�ta ISDN PCI karte, bet nav zin�ms kartes tips. L�dzu izv�lieties "
 "k�du no n�kamaj� ekr�n� uzskait�taj�m PCI kart�m."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "Nav atrasta neviena ISDN PCI karte. L�dzu izv�lieties k�du no saraksta."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"J�su sist�m� nav atrasts neviens ethernet t�kla adapteris.\n"
-"Nevaru uzst�d�t �o piesl�guma veidu."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Izv�lieties t�kla interfeisu"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"L�dzu nor�diet, kuru t�kla adapteri v�laties izmantot Interneta piesl�gumam."
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "T�kla interfeiss"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Vai j�s piekr�tat?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Gatavojos p�rstart�t t�kla ier�ci:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ADSL konfigur�cija"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Vai v�laties start�t piesl�gumu palai�anas laik�?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "L�dzu nor�diet, kuram seri�lajam portam ir piesl�gts mod�ms."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Iezvanpieejas opcijas"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Savienojuma nosaukums"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Telefona numurs"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Lietot�ja ID"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autentifik�cija"
+#: ../../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 "Ar skriptu"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Izmantojot termin�li"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Dom�na nosaukums"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 #, fuzzy
 msgid "First DNS Server (optional)"
 msgstr "Pirmais DNS serveris"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 #, fuzzy
 msgid "Second DNS Server (optional)"
 msgstr "Otrais DNS serveris"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "Gatavojos p�rstart�t t�kla ier�ci $netc->{NET_DEVICE}. Vai piekr�tat?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5810,7 +5510,7 @@ msgstr ""
 "\n"
 "Varat atsl�gties vai p�rkonfigur�t piesl�gumu."
 
-#: ../../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."
@@ -5818,11 +5518,11 @@ msgstr ""
 "\n"
 "Varat p�rkonfigur�t piesl�gumu."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Pa�laik j�s esat piesl�dzies Internetam."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5830,99 +5530,53 @@ msgstr ""
 "\n"
 "Varat piesl�gties Internetam vai p�rkonfigur�ts piesl�gumu."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Pa�laik j�s neesat piesl�dzies Internetam."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Piesl�gties Internetam"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Atsl�gties no Interneta"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Konfigur�t t�kla piesl�gumu (LAN vai Interneta)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Interneta piesl�gums un konfigur�cija"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "T�kla konfigur��anas meistars"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "�r�js ISDN mod�ms"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Iek��ja ISDN karte"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "K�ds ir j�su ISDN piesl�guma veids?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Piesl�gties Internetam"
-
-#: ../../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'"
+#: ../../network/netconnect.pm_.c:96
+#, fuzzy, c-format
+msgid "We are now going to configure the %s connection."
 msgstr ""
-"Parast�kais veids, k� piesl�gties ar adsl, ir pppoe.\n"
-"Da�i piesl�gumi izmanto pptp, pavisam nedaudzi dhcp.\n"
-"Ja j�s nezinat, izv�lieties 'izmantot pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "izmantot dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "izmantot pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "izmantot pptp"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "Gatavojos p�rstart�t t�kla ier�ci %s. Vai piekr�tat?"
+"\n"
+"Varat atsl�gties vai p�rkonfigur�t piesl�gumu."
 
-#: ../../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 ""
-"Kuru dhcp klientu v�laties izmantot?\n"
-"Noklus�ti ir dhcpcd"
+"\n"
+"Varat atsl�gties vai p�rkonfigur�t piesl�gumu."
 
-#: ../../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 "T�kla konfigur�cija"
 
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Vai v�laties p�rstart�t t�klu"
-
-#: ../../netconnect.pm_.c:904
-#, fuzzy, c-format
-msgid ""
-"A problem occured while restarting the network: \n"
-"\n"
-"%s"
-msgstr "Vai v�laties p�rstart�t t�klu"
-
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -5930,7 +5584,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"
@@ -5938,99 +5592,114 @@ 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
 msgid "Choose the profile to configure"
 msgstr "Izv�lieties konfigur�jamo profilu"
 
-#: ../../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 "Noskaidroju ier�ces..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Parasts mod�ma piesl�gums"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "atkl�ts uz porta %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "ISDN piesl�gums"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "atkl�ts %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (vai ADSL) piesl�gums"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "LAN piesl�gums"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "atkl�ts uz interfeisa %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Kabe�a piesl�gums"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#, fuzzy
+msgid "cable connection detected"
+msgstr "Kabe�a piesl�gums"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "LAN piesl�gums"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "ethernet karte(s) atrasta"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "K� j�s v�laties piesl�gties Internetam?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "Izv�lieties izmantojamo r�ku"
 
-#: ../../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 "Interneta piesl�guma koplieto�ana"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "t�kla karte nav atrasta"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Vai v�laties start�t piesl�gumu palai�anas laik�?"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Konfigur�ju t�klu"
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "T�kla konfigur�cija"
+
+#: ../../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 "Vai v�laties p�rstart�t t�klu"
+
+#: ../../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 ""
-"L�dzu ievadiet j�su resursa v�rdu, ja to zinat.\n"
-"Da�u DHCP serveru darb�bai ir nepiecie�ams resursa v�rds.\n"
-"Resursa v�rdam ir j�b�t pilnam kvalific�tam resursa v�rdam,\n"
-"piem�ram, ``mybox.mylab.myco.com''."
 
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Resursa v�rds:"
+#: ../../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"
@@ -6041,7 +5710,7 @@ msgstr ""
 "Vienk�r�i apstipriniet, ka v�laties saglab�t �o konfigur�ciju.\n"
 "T�l�ko lauku izmain��ana p�rrakst�s �o konfigur�ciju."
 
-#: ../../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"
@@ -6051,38 +5720,38 @@ msgstr ""
 "Visi dati j�ievada k� IP adreses ar punktiem atdal�tu decim�lu\n"
 "skait�u veid� (piem�ram, 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 "Konfigur�ju t�kla iek�rtu %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (draiveris $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (draiveris %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 adrese"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "T�kla maska"
 
-#: ../../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 "Autom�tisks 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 adreses form�tam j�b�t 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"
@@ -6094,72 +5763,174 @@ msgstr ""
 "piem�ram, ``mybox.mylab.myco.com''.\n"
 "J�s varat ievad�t ar� v�rtejas IP adresi, ja t�da ir"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNS serveris"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "V�rteja"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "V�rtejas ier�ce"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Proxy serveru konfigur�cija"
 
-#: ../../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 b�tu j�b�t http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Proxy b�tu j�b�t ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Interneta konfigur�cija"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Vai v�laties m��in�t piesl�gties internetam t�l�t?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Izm��inu piesl�gumu..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Sist�ma pa�laik ir piesl�gta Internetam."
+
+#: ../../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 ""
+"��iet, ja j�su sist�mu nav piesl�gta Internetam.\n"
+"M��iniet p�rkonfigur�t piesl�gumu."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Savienojuma konfigur��ana"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "L�dzu aizpieldiet vai izv�lietis lauku"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "Kartes IRQ"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Kartes mem (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "Kartes IO"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "Kartes IO_0"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "Kartes IO_1"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "J�su priv�tais telefona numurs"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Pakalpojumu sniedz�ja nosaukums (piem., provider.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Pakalpojumu sniedz�ja telefona numurs"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Provaidera dns 1 (nav oblig�ti)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Provaidera dns 2 (nav oblig�ti)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Tastat�ras izv�le"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Zvan��anas re��ms"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "Savienojuma tips: "
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Savienojuma tips: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Konta nosaukums (lietot�ja v�rds)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Konta parole"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
-msgstr "�ai platformai papla�in�t� sada�a nav pieejama"
+msgstr "�ai platformai papla�in�t� part�cija nav pieejama"
 
-#: ../../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 ""
-"J�su diska sada�u tabul� ir caurums, bet es to nevaru izmantot.\n"
-"Vien�gais risin�jums ir p�rvietot prim�ras sada�as t�, lai caurums atrastos "
-"blakus papla�in�taj�m sada��m"
+"J�su diska part�ciju tabul� ir caurums, bet es to nevaru izmantot.\n"
+"Vien�gais risin�jums ir p�rvietot prim�ras part�cijas t�, lai caurums "
+"atrastos blakus papla�in�taj�m part�cij�m"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "K��da, nolasot failu %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Atjauno�ana no faila %s neizdev�s: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Slikts rezerves kopijas fails"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "K��da, ierakstot fail� %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"
@@ -6186,49 +5957,213 @@ msgstr "der�ga"
 msgid "maybe"
 msgstr "varb�t"
 
-#: ../../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 "Lok�ls printeris"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Att�ls printeris"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Att�ls CUPS serveris"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Att�ls lpd serveris"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "T�kla printeris (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 "Printera serveris"
 
-#: ../../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 "Printera ier�ces 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 "(modulis %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Izv�lieties printera piesl�gumu"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "K� �is printeris ir piesl�gts?"
+
+#: ../../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 ""
+"Izmantojot att�lu CUPS serveri, �eit jums nav nepiecie�ams\n"
+"konfigur�t printeri; printeri tiks atrasti autom�tiski.\n"
+"Ja j�s �aubaties, izv�lieties \"Att�ls CUPS serveris\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Nevienu"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Nor�diet noklus�to lietot�ju:"
+
+#: ../../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 "Pele"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Att�ls printeris"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP adreses form�tam j�b�t 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Porta numuram ir j�b�t skaitlim"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Lok�ls printeris"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "CUPS servera IP"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Ports"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "S�kn��anas stila konfigur��ana"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Noskaidroju ier�ces..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "P�rbaud�t portus"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Printeris, modelis \"%s\", atrasts pie "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Lok�l� printera ier�ce"
 
-#: ../../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"
@@ -6236,37 +6171,60 @@ msgstr ""
 "Kurai ier�cei ir piesl�gts printeris\n"
 "(atcerieties, ka /dev/lp0 atbilst LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Printera ier�ce"
 
-#: ../../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 "Nolasu CUPS draiveru datub�zi..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Att�la lpd printera opcijas"
 
-#: ../../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 ""
 "Lai izmantotu att�lu lpd drukas rindu, jums j�nor�da\n"
 "printera servera resursa v�rds un t�s servera rindas\n"
 "nosaukums, kurai j�adres� drukas uzdevumi."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
+msgstr "Att�l� resursa v�rds"
+
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Att�ls printeris"
+
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
 msgstr "Att�l� resursa v�rds"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Att�l� rinda"
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Att�l� resursa v�rds"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) printera opcijas"
 
-#: ../../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"
@@ -6280,29 +6238,37 @@ msgstr ""
 "koplietojuma v�rds un atbilsto�s lietot�ja v�rds, parole un\n"
 "darba grupas inform�cija."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "SMB servera resurss"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "SMB servera IP"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Koplietojuma v�rds"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Darba grupa"
 
-#: ../../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 printera opcijas"
 
-#: ../../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."
@@ -6312,298 +6278,835 @@ msgstr ""
 "TCP/IP resursa v�rda!), k� ar� j�su izv�l�t� printera rindas\n"
 "nosaukums un jebkur� atbilsto�s lietot�ja v�rds un parole."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Printera serveris"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Printera rindas nosaukums"
 
-#: ../../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 "Socket printera opcijas"
 
-#: ../../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 ""
 "Lai druk�tu ar socket printeri, jums ir j�nor�da printera\n"
 "resursa v�rds t�kl� un papildus ar� porta numurs."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Printera resursa v�rds"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Ports"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "Printera resursa v�rds"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Printera ier�ces 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:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "J�s varat tie�i nor�d�t URI, lai piek��tu printerim ar CUPS."
+#: ../../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 "Printera nosaukums"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Apraksts"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Atra�an�s vieta"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Nolasu CUPS draiveru datub�zi..."
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "Printera piesl�gums"
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "K�ds ir j�su printera tips?"
 
-#: ../../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 "Interneta konfigur�cija"
+
+#: ../../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 "Interneta konfigur�cija"
+
+#: ../../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 "Vai v�laties izm��in�t printeri?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "P�rbaud�t portus"
+
+#: ../../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 "J�, izdruk�t abas izm��in�juma lapas"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Printeris"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Standarta"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Tiek druk�ta(s) izm��in�juma lapa(s)..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Tiek druk�ta(s) izm��in�juma lapa(s)..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Tiek druk�ta(s) izm��in�juma lapa(s)..."
 
-#: ../../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 ""
 "Izm��in�juma lapa(s) ir nos�t�ta(s) printera demonam.\n"
-"This may take a little time before printer start.\n"
+"It may take some time before the printer starts.\n"
 "Var paiet zin�ms laiks, pirms printeris s�k druk�t.\n"
 "Izdrukas st�voklis:\n"
 "%s\n"
 "\n"
 "Vai tas darbojas pareizi?"
 
-#: ../../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 ""
 "Izm��in�juma lapa(s) ir nos�t�ta(s) printera demonam.\n"
 "Var paiet zin�ms laiks, pirms printeris s�k druk�t.\n"
 "Vai tas darbojas pareizi?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "J�, izdruk�t ASCII izm��in�juma lapu"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "J�, izdruk�t PostScript izm��in�juma lapu"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Nav printera"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "J�, izdruk�t abas izm��in�juma lapas"
+#: ../../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 "Konfigur�t printeri"
+#: ../../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 "Atsl�dzu t�klu"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Printera opcijas"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Pap�ra izm�rs"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "Nolasu CUPS draiveru datub�zi..."
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Vai izmest lapu p�c izdrukas?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Interneta konfigur�cija"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Uniprint draivera opcijas"
+#: ../../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 "Kr�su dzi�uma opcijas"
+#: ../../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 "Druk�t tekstu k� 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 "Vai labot teksta k�p�veida izdruku?"
+#: ../../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 "Lappu�u skaits vien� izdrukas lap�"
+#: ../../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 "Lab�/Kreis� mala punktos (1/72 collas da��s)"
+#: ../../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 "Aug��j�/Apak��j� mala punktos (1/72 collas da��s)"
+#: ../../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 "Papildus GhostScript opcijas"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Papildus teksta opcijas"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "A�g�rna lappu�u sec�ba"
+#: ../../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 "Vai v�laties konfigur�t printeri?"
+#: ../../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 ""
-"Eksist� sekojo�as drukas rindas.\n"
-"J�s varat pievienot jaunass vai izmain�t eso��s."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS start��ana"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Nav printera"
 
-#: ../../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 "Nolasu CUPS draiveru datub�zi..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Izv�lieties printera piesl�gumu"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Konfigur�cija"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "K� �is printeris ir piesl�gts?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Izm��inu piesl�gumu..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Izv�lieties att�la printera piesl�gumu"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "T�kla konfigur��ana"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitors nav konfigur�ts"
+
+#: ../../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 ""
-"Izmantojot att�lu CUPS serveri, �eit jums nav nepiecie�ams\n"
-"konfigur�t printeri; printeri tiks atrasti autom�tiski.\n"
-"Ja j�s �aubaties, izv�lieties \"Att�ls CUPS serveris\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Konfigur�ju t�klu"
+
+#: ../../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 ""
-"Izmantojot att�lu CUPS serveri, �eit jums nav nepiecie�ams\n"
-"konfigur�t nevienu printeri. Printeri tiks atrasti autom�tiski,\n"
-"ja vien serveris nav piesl�gts citam t�klam; t�d� gad�jum� jums\n"
-"ir j�nor�da CUPS servera IP adrese un, iesp�jams, porta numurs."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "CUPS servera 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 "Porta numuram ir j�b�t skaitlim"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Kuru druk��anas sist�mu v�laties izmantot?"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "No�emt rindu"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Augsts"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoisks"
+
+#: ../../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 "Kuru druk��anas sist�mu v�laties izmantot?"
+
+#: ../../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 ""
-"Katram printerim ir nepiecie�ams nosaukums (piem�ram, lp).\n"
-"Var nor�d�t ar� citus parametrus, piem�ram, printera aprakstu vai t�\n"
-"atra�an�s vietu. K�du nosaukumu pie��irt �im printerim, un k�d� veid�\n"
-"printeris ir piesl�gts?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Printera nosaukums"
+#: ../../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 "Apraksts"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Atra�an�s vieta"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "Izv�lieties printera piesl�gumu"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Kuru druk��anas sist�mu v�laties izmantot?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Konfigur�t printeri"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Printera opcijas"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Nolasu CUPS draiveru datub�zi..."
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "Vai v�laties konfigur�t printeri?"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../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 ""
-"Katrai drukas rindai (uz kuru tiek adres�ti drukas uzdevumi) ir "
-"nepiecie�ams\n"
-"nosaukums (bie�i lp) un tai piesaist�ts spol��anas katalogs. K�du nosaukumu\n"
-"un katalogu izmantot �ai rindai un k� ir piesl�gts printeris?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Rindas nosaukums"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Noklus�ts)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Att�ls CUPS serveris"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Att�ls CUPS serveris"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Spol��anas katalogs"
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Nav printera"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Vai v�laties izm��in�t �o konfigur�ciju?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Interneta konfigur�cija"
+
+#: ../../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 "Interneta piesl�guma koplieto�ana"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
 msgstr "Printera piesl�gums"
 
-#: ../../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 "Tiek druk�ta(s) izm��in�juma lapa(s)..."
+
+#: ../../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 "Att�ls printeris"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Nolasu CUPS draiveru datub�zi..."
+
+#: ../../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 "Vai v�laties p�rstart�t t�klu"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Nolasu CUPS draiveru datub�zi..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "Proxy serveru konfigur�cija"
+
+#: ../../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 "Ports"
+
+#: ../../proxy.pm_.c:44
+#, fuzzy
+msgid "Url should begin with 'http:'"
+msgstr "Proxy b�tu j�b�t http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+#, fuzzy
+msgid "The port part should be numeric"
+msgstr "Porta numuram ir j�b�t skaitlim"
+
+#: ../../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 b�tu j�b�t 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 "Autore�istr��an�s"
+
+#: ../../proxy.pm_.c:82
+#, fuzzy
+msgid "password"
+msgstr "Parole"
+
+#: ../../proxy.pm_.c:84
+#, fuzzy
+msgid "re-type password"
+msgstr "Bez paroles"
+
+#: ../../proxy.pm_.c:88
+#, fuzzy
+msgid "The passwords don't match. Try again!"
+msgstr "Paroles nesakr�t"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "Nevar pievienot sada�u _format�tam_ RAID md%d"
+msgstr "Nevar pievienot part�ciju _format�tam_ RAID md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Neizdodas ierakst�t failu $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Neizdodas ierakst�t failu %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid neizdev�s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid neizdev�s (varb�t nav uzst�d�ti raidtools?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
-msgstr "Nepietiek diska sada�u RAID l�menim %d\n"
+msgstr "Nepietiek diska part�ciju RAID l�menim %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 ir periodisku komandu pl�not�js."
 
-#: ../../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."
@@ -6611,7 +7114,7 @@ msgstr ""
 "apmd paredz�ts baterijas st�vok�a nov�ro�anai un gr�mato�anai ar syslog.\n"
 "To var izmantot ar� datora izsl�g�anai, kad baterija ir izl�d�ta."
 
-#: ../../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."
@@ -6620,7 +7123,7 @@ msgstr ""
 "k� ar� palai� komadu paketes, kad vid�j� sist�mas noslodze ir pietieko�i\n"
 "zema."
 
-#: ../../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 "
@@ -6632,7 +7135,7 @@ msgstr ""
 "iesp�ju sal�dzinot ar UNIX cron, taj� skait� ar� lab�ku dro��bu un daudz\n"
 "izv�rtst�kas konfigur��anas iesp�jas."
 
-#: ../../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 "
@@ -6644,13 +7147,13 @@ msgstr ""
 "izgriezt-un-iespraust oper�cijas, k� ar� pied�v� izleco�o izv�l�u\n"
 "atbalstu konsolei."
 
-#: ../../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."
@@ -6658,7 +7161,7 @@ msgstr ""
 "Apache ir Vispasaules t�mek�a (WWW) serveris. Tas tiek izmantots HTML\n"
 "failu un CGI izplat��anai."
 
-#: ../../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 "
@@ -6672,13 +7175,13 @@ msgstr ""
 "start��anu, taj� skait� telnet, ftp, rsh un rlogin. inetd atsl�g�ana\n"
 "atsl�dz ar� visus servisus, par kuriem tas atbild."
 
-#: ../../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"
@@ -6688,23 +7191,23 @@ msgstr ""
 "/etc/sysconfig/keyboard. To var izv�l�ties, izmantojot programmu kbdconfig.\n"
 "Vairum� gad�jumu �o pakotni ir j�atst�j izv�l�tu."
 
-#: ../../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)."
@@ -6712,13 +7215,13 @@ msgstr ""
 "lpd ir drukas demons, kas ir nepiecie�ams lpr pareizai darb�bai. Tas ir\n"
 "serveris, kas nos�ta drukas uzdevumus printeri(e)m."
 
-#: ../../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."
@@ -6726,7 +7229,7 @@ msgstr ""
 "named (BIND) ir dom�nu v�rdu serveris (DNS), kas tiek izmantots resursu\n"
 "v�rdiem atbilsto�o IP adre�u noskaidro�anai."
 
-#: ../../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."
@@ -6734,7 +7237,7 @@ msgstr ""
 "Mounts un unmounts ir T�kla Failu sist�mas (NFS), SMB (Lan\n"
 "Manager/Windows) un NCP (NetWare) mont��anas punkti."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6742,7 +7245,7 @@ msgstr ""
 "Aktiviz�/Deaktiviz� visus t�kla interfeisus, kas ir konfigur�ti\n"
 "start��anai sist�mas s�kn��anas laik�."
 
-#: ../../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"
@@ -6752,7 +7255,7 @@ msgstr ""
 "�is serviss nodro�ina NFS servera funkcionalit�ti, un to var konfigur�t\n"
 "ar faila /etc/exports pal�dz�bu."
 
-#: ../../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."
@@ -6760,17 +7263,17 @@ msgstr ""
 "NFS ir popul�rs protokols failu koplieto�anai TCP/IP t�klos.\n"
 "�is serviss nodro�ina NFS failu aizsl�g�anas funkcionalit�ti."
 
-#: ../../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 "
@@ -6781,7 +7284,7 @@ msgstr ""
 "uztur��anai p�rn�s�jamos datoros. Tas netiks start�ts, ja nav konfigur�ts,\n"
 "t�p�c ir dro�i to instal�t datoros, kam tas nav nepiecie�ams."
 
-#: ../../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 "
@@ -6792,7 +7295,7 @@ msgstr ""
 "piem�ram, NFS un NIS. portmap serveri ir j�izmanto datoros, kas\n"
 "darbojas k� RPC protokolus izmantojo�u protokolu serveri."
 
-#: ../../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."
@@ -6800,7 +7303,7 @@ msgstr ""
 "Postfix ir Pasta Transporta A�ents, un t� ir programma, kas p�rvieto\n"
 "pastu no viena datora uz citu."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6808,13 +7311,13 @@ msgstr ""
 "Saglab� un atjauno sist�mas entropijas kr�tuvi, lai �ener�tu\n"
 "kvalitat�v�kus gad�jumskait�us."
 
-#: ../../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"
@@ -6825,7 +7328,7 @@ msgstr ""
 "t�klos, sare���t�kiem t�kliem ir nepiecie�ami sare���t�ki mar�rutiz��anas\n"
 "protokoli."
 
-#: ../../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."
@@ -6833,7 +7336,7 @@ msgstr ""
 "rstat protokols �auj t�kla lietot�jiem sa�emt veiktsp�jas\n"
 "inform�ciju par jebkuru �� t�kla datoru."
 
-#: ../../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."
@@ -6841,7 +7344,7 @@ msgstr ""
 "Protokols rusers t�kla lietot�jiem �auj noskaidrot, kuru lietot�ju\n"
 "sesijas ir atv�rtas citos atbildo�ajos datoros."
 
-#: ../../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)."
@@ -6849,12 +7352,12 @@ msgstr ""
 "Protokols rwho att�liem lietot�jiem �auj sa�emt visu atv�rto lietot�ju\n"
 "sesiju sarakstu no datora, kur� darbojas rwho demons (l�dz�gi finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 #, fuzzy
 msgid "Launch the sound system on your machine"
 msgstr "Palaist X-Window sist�mu start��anas laik�"
 
-#: ../../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."
@@ -6862,61 +7365,156 @@ msgstr ""
 "Syslog ir meh�nisms, ko daudzi demoni izmanto zi�ojumu gr�mato�anai\n"
 "daudzos sist�mas �urn�lu failos. Ir gudra doma vienm�r darbin�t 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 "Start� un aptura X Fontu Serveri s�kn��anas un aizv�r�anas laik�."
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Izv�l�ties, kurus servisus vajag autom�tiski start�t iel�des laik�"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Printeris"
+
+#
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internets"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Sist�mas re��ms"
+
 #: ../../services.pm_.c:137
 #, fuzzy
+msgid "Remote Administration"
+msgstr "Att�la lpd printera opcijas"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Serveris, Datub�zes"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "ier�ce"
+
+#: ../../services.pm_.c:198
+#, fuzzy
 msgid "running"
 msgstr "Uzman�bu"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 #, fuzzy
 msgid "stopped"
 msgstr "Papildin�t"
 
-#: ../../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 "Instal�ju pakotni %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"
 msgstr ""
-"Man neizdodas nolas�t sada�u tabulu, priek� manis t� ir p�r�k boj�ta :(\n"
-"Es m��in��u turpin�t, atsl�dzot slikt�s sada�as"
+"Man neizdodas nolas�t part�ciju tabulu, priek� manis t� ir p�r�k boj�ta :(\n"
+"Es m��in��u turpin�t, atsl�dzot slikt�s part�cijas"
+
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "K��da"
+
+#: ../../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 "P�cinstal��anas konfigur��ana"
+
+#: ../../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 "S�kn��anas stila konfigur��ana"
+
+#: ../../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 "Apsveicam!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "Interneta piesl�guma koplieto�ana"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Interneta piesl�guma koplieto�ana pa�laik ir iesl�gta"
 
-#: ../../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"
@@ -6928,33 +7526,33 @@ msgstr ""
 "\n"
 "Ko j�s v�laties dar�t?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "atsl�gt"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "atmest"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "p�rkonfigur�t"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 #, fuzzy
 msgid "Disabling servers..."
 msgstr "Noskaidroju ier�ces..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 #, fuzzy
 msgid "Internet connection sharing is now disabled."
 msgstr "Interneta piesl�guma koplieto�ana pa�laik ir atsl�gta"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Interneta piesl�guma koplieto�ana pa�laik ir atsl�gta"
 
-#: ../../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"
@@ -6966,28 +7564,20 @@ msgstr ""
 "\n"
 "Ko j�s v�laties dar�t?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "iesl�gt"
 
-#: ../../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 "Interneta piesl�guma koplieto�ana pa�laik ir iesl�gta"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Konfigur�cijas faila saturu neizdodas saprast."
-
-#: ../../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"
@@ -7004,22 +7594,22 @@ msgstr ""
 "\n"
 "Vai v�laties uzst�d�t Interneta piesl�guma koplieto�anu?"
 
-#: ../../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 "Interfeiss"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "J�su sist�m� nav t�kla adaptera!"
 
-#: ../../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."
@@ -7028,7 +7618,11 @@ msgstr ""
 "dzel�u konfigur��anas r�ku."
 
 #: ../../standalone/drakgw_.c:224
-#, fuzzy, c-format
+msgid "Network interface"
+msgstr "T�kla interfeiss"
+
+#: ../../standalone/drakgw_.c:225
+#, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
 "\n"
@@ -7038,11 +7632,11 @@ msgid ""
 msgstr ""
 "J�su sist�m� ir tikai viens konfigur�ts t�kla adapteris:\n"
 "\n"
-"$interface\n"
+"%s\n"
 "\n"
 "Vai v�laties uzst�d�t j�su lok�lo datort�klu ar �o adapteri?"
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -7050,7 +7644,7 @@ msgstr ""
 "L�dzu izv�lieties, kur� t�kla adapteris b�s piesl�gts j�su lok�lajam "
 "datort�klam."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 #, fuzzy
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
@@ -7058,15 +7652,16 @@ msgstr ""
 "Br�din�jums, t�kla adapteris jau ir konfigur�ts.\n"
 "Vai v�laties to konfigur�t atk�rtoti?"
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "Potenci�ls LAN adre�u konflikts atkl�ts �aj� $_! konfigur�cij�!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "Potenci�ls LAN adre�u konflikts atkl�ts �aj� %s! konfigur�cij�!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Tika atkl�ta ugunsm�ra konfigur�cija!"
 
-#: ../../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."
@@ -7074,23 +7669,20 @@ msgstr ""
 "Br�din�jums! Ir atkl�ta eksist�jo�a ugunsm�ra konfigur�cija. P�c "
 "instal��anas jums varb�t vajadz�s patst�v�gi pielabot konfigur�ciju."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Konfigur�ju..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Tiek konfigur�ti skripti, instal�tas programmas, start�ti serveri..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Probl�mas, instal�jot pakotni $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Apsveicam!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Probl�mas, instal�jot pakotni %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 "
@@ -7102,7 +7694,7 @@ msgstr ""
 "konfigur��anu\n"
 "(DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 #, fuzzy
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
@@ -7111,7 +7703,7 @@ msgstr ""
 "\n"
 "Ko j�s v�laties dar�t?"
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 #, fuzzy
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
@@ -7120,17 +7712,17 @@ msgstr ""
 "\n"
 "Ko j�s v�laties dar�t?"
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 #, fuzzy
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Interneta piesl�guma koplieto�ana pa�laik ir iesl�gta"
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 #, fuzzy
 msgid "Internet connection sharing configuration"
 msgstr "Interneta piesl�gums un konfigur�cija"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, fuzzy, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7140,88 +7732,87 @@ msgid ""
 "Click on Configure to launch the setup wizard."
 msgstr "Interneta piesl�guma koplieto�ana"
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "T�kla konfigur�cija (%d adapteri)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
 msgstr "Profils: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "Dz�st profilu..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Dz��amais profils:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Jauns profils..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Veidojam� profila nosaukums:"
+#: ../../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 "Resursa v�rds: "
 
 #
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Interneta pieeja"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tips:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "V�rteja:"
 
 #
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "interfeiss:"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:192
 msgid "Status:"
 msgstr "St�voklis:"
 
-#: ../../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 "Nav piesl�gts"
 
-#: ../../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 "Nav piesl�gts"
 
-#: ../../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 "Izm��inu piesl�gumu..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 #, fuzzy
 msgid "Closing your connection..."
 msgstr "Izm��inu piesl�gumu..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7229,124 +7820,119 @@ msgid ""
 "in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 #, fuzzy
 msgid "The system is now disconnected."
 msgstr "Sist�ma pa�laik ir piesl�gta Internetam."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Konfigur�t Interneta pieeju..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "LAN konfigur�cija"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adapteris"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Draiveris"
 
 #
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interfeiss"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 #, fuzzy
 msgid "Protocol"
 msgstr "Protokols"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "St�voklis:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Konfigur�t lok�lo datort�klu..."
 
-#: ../../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 ""
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 #, fuzzy
 msgid "Please Wait... Applying the configuration"
 msgstr "Konfigur�cijas izm��in��ana"
 
-#: ../../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 konfigur�cija"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapteris %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 "DHCP klients"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Atsl�gt"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Akt�va"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Iesl�gt"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Akt�va"
 
-#: ../../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 "Interneta piesl�guma konfigur�cija"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Interneta piesl�guma konfigur�cija"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Savienojuma tips: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parametri"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Provaidera dns 1 (nav oblig�ti)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Provaidera dns 2 (nav oblig�ti)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Ethernet karte"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP klients"
 
@@ -7415,16 +8001,31 @@ msgstr ""
 "M�s izmantojam 4. l�me�a iesp�jas, ta�u tagad sist�ma ir piln�b�\n"
 "aizsl�gta. Dro��ba tagad ir maksim�laj� l�men�."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Uzst�du dro��bas l�meni"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Nor�diet servera opcijas"
+
+#: ../../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 "Uzst�du dro��bas l�meni"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 #, fuzzy
 msgid "Control Center"
 msgstr "Piesl�gties Internetam"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Izv�lieties izmantojamo r�ku"
 
@@ -7452,90 +8053,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Neizdodas uzs�kt uzlabo�anu no t�kla !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "nav atrasta seri�la_usb\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Vai emul�t tre�o pogu?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "L�dzu notest�jiet peli"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-#, fuzzy
-msgid "Network Monitoring"
-msgstr "T�kla konfigur�cija"
-
-#: ../../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 "Pele"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Connecting to Internet "
-msgstr "Piesl�gties Internetam"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Disconnecting from Internet "
-msgstr "Atsl�gties no Interneta"
-
-#: ../../standalone/net_monitor_.c:114
-#, fuzzy
-msgid "Disconnection from Internet failed."
-msgstr "Atsl�gties no Interneta"
-
-#: ../../standalone/net_monitor_.c:115
-#, fuzzy
-msgid "Disconnection from Internet complete."
-msgstr "Atsl�gties no Interneta"
-
-#: ../../standalone/net_monitor_.c:117
-#, fuzzy
-msgid "Connection complete."
-msgstr "Savienojuma nosaukums"
-
-#: ../../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 "Nav piesl�gts"
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Disconnect"
-msgstr "ISDN piesl�gums"
-
 #: ../../standalone/tinyfirewall_.c:29
 #, fuzzy
 msgid "Firewalling Configuration"
@@ -7561,16 +8086,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 "Valodas izv�le"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Instal��anas klases izv�le"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Ciet� diska noteik�ana"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Peles konfigur��ana"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Tastat�ras izv�le"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr ""
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Failu sist�mu uzst�d��ana"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Diska format��ana"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Instal�jamo pakot�u izv�le"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Sist�mas instal��ana"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Lietot�ju pievieno�ana"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "T�kla konfigur��ana"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Servisu konfigur��ana"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Sist�mdisketes rad��ana"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "S�kn�t�ja instal��ana"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "X konfigur��ana"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Instal��anas beigas"
+
+#: ../../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"
@@ -7581,7 +8174,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"
@@ -7589,7 +8182,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"
@@ -7597,7 +8190,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"
@@ -7606,7 +8199,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"
@@ -7614,7 +8207,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"
@@ -7622,7 +8215,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"
@@ -7630,7 +8223,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"
@@ -7638,7 +8231,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"
@@ -7646,7 +8239,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"
@@ -7655,7 +8248,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"
@@ -7663,25 +8256,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, fuzzy, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Adapteris %s: %s"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, fuzzy, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "K��da, atverot %s ierakst��anai: %s"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr ""
+msgid "Web/FTP"
+msgstr "Serveris, T�meklis/FTP"
 
 #
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Development"
-msgstr "Izstr�de, T�meklis"
+msgid "Network Computer (client)"
+msgstr "T�kla dators, X klients"
+
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+#: ../../share/compssUsers:999
+msgid "Office"
+msgstr "Birojs"
+
+#: ../../share/compssUsers:999
+msgid "Gnome Workstation"
+msgstr "Gnome darbastacija"
+
+#: ../../share/compssUsers:999
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "R�ki darbam ar Palm Pilot vai Visor"
 
 #
 #: ../../share/compssUsers:999
@@ -7694,146 +8303,141 @@ msgid "Firewall/Router"
 msgstr "Serveris, Ugunsm�ris/Mar�rutizators"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Person�g�s inform�cijas mened�ments"
-
-#
-#: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multim�diji - Grafika"
-
-#
-#: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internets"
+msgid "Domain Name and Network Information Server"
+msgstr ""
 
-#
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer (client)"
-msgstr "T�kla dators, X klients"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Biroja programmas: teksta procesori (kword, abiword), izkl�jlapas (lspread, "
+"gnumeric), pdf skat�t�ji, u.c."
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr "Audio r�ki: mp3 un midi atska�ot�ji, mik�eri u.c."
 
+#: ../../share/compssUsers:999
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Gr�matas un Howto faili par Linux un Br�vo programmat�ru"
+
 #
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Interneta dators"
+msgid "KDE Workstation"
+msgstr "KDE darbastacija"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Birojs"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c."
 
 #
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multim�diju dators"
+msgid "Multimedia - Video"
+msgstr "Multim�diji - Video"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"R�ku komplekts, lai las�tu un s�t�tu pastu vai jaunumus (pine, mutt, tin..) "
-"un p�rl�kotu T�mekli"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "R�ki pastam, jaunumiem, t�meklim, failu sa�em�anai un �atam"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C un C++ izstr�des bibliot�kas, programmas un include faili"
+msgid "Database"
+msgstr "Serveris, Datub�zes"
 
 #: ../../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 "Programmas j�su finan�u p�rvald��anai, piem�ram, gnucach"
+#, fuzzy
+msgid "Tools to ease the configuration of your computer"
+msgstr "Vai v�laties izm��in�t �o konfigur�ciju?"
 
+#
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "Multimedia - Sound"
+msgstr "Multim�diji - Ska�a"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+msgid "Utilities"
+msgstr "Util�ti"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "Dokument�cija"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c."
-
-#: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Util�ti"
+msgid "Console Tools"
+msgstr "Konsoles r�ki"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
+msgid "Postfix mail server, Inn news server"
 msgstr ""
 
+#
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr ""
+msgid "Internet station"
+msgstr "Interneta dators"
 
 #
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multim�diji - Ska�a"
+msgid "Multimedia station"
+msgstr "Multim�diju dators"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Izklaides programmas: ark�de, galdi�sp�les, strat��ija u.c."
+#, fuzzy
+msgid "Configuration"
+msgstr "LAN konfigur�cija"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video atska�ot�ji un redaktori"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Citas grafiskas darbavirsmas (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsoles r�ki"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, galven� grafisk� vide kopa ar papildus r�ku kolekciju"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Ska�as un video atska�o�anas/redi���anas programmas"
+msgid "Graphical Environment"
+msgstr ""
 
+#
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Scientific Workstation"
-msgstr "Zin�tnisk� darbastacija"
+msgid "Development"
+msgstr "Izstr�de, T�meklis"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Redaktori, �aulas, failu r�ki, termin��i"
+msgid "Apache, Pro-ftpd"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Gr�matas un Howto faili par Linux un Br�vo programmat�ru"
+msgid "Tools to create and burn CD's"
+msgstr "R�ki CD disku rad��anai un ierakst��anai"
 
+#
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Grafisk� vide ar lietotajiem draudz�gu programmu komplektu un darbavirsmas "
-"r�kiem"
+msgid "Office Workstation"
+msgstr "Biroja dators"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm u.c."
 
-#
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Sp�les"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafisk�s programmas, piem�ram, The Gimp"
 
-#
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multim�diji - Video"
+msgid "DNS/NIS "
+msgstr ""
+
+#: ../../share/compssUsers:999
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C un C++ izstr�des bibliot�kas, programmas un include faili"
 
 #: ../../share/compssUsers:999
 #, fuzzy
@@ -7841,133 +8445,1298 @@ msgid "Network Computer server"
 msgstr "Serveris, T�kla datora serveris"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafisk�s programmas, piem�ram, The Gimp"
+msgid "Mail/Groupware/News"
+msgstr "Serveris, Pasts/Grupu r�ki/Jaunumi"
 
 #
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Biroja dators"
+msgid "Game station"
+msgstr "Sp��u dators"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Environment, galven� grafisk� vide kopa ar papildus r�ku kolekciju"
+msgid "Video players and editors"
+msgstr "Video atska�ot�ji un redaktori"
 
+#
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Citas grafiskas darbavirsmas (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multim�diji - Grafika"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "R�ki CD disku rad��anai un ierakst��anai"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Izklaides programmas: ark�de, galdi�sp�les, strat��ija u.c."
 
-#
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multim�diji - CD ierakst��ana"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"R�ku komplekts, lai las�tu un s�t�tu pastu vai jaunumus (pine, mutt, tin..) "
+"un p�rl�kotu T�mekli"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
 msgstr "Arhiv��ana, emulatori, nov�ro�ana"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Serveris, Datub�zes"
+msgid "Personal Finance"
+msgstr "Person�g�s finanses"
 
 #: ../../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 ""
-"Biroja programmas: teksta procesori (kword, abiword), izkl�jlapas (lspread, "
-"gnumeric), pdf skat�t�ji, u.c."
+"Grafisk� vide ar lietotajiem draudz�gu programmu komplektu un darbavirsmas "
+"r�kiem"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Serveris, T�meklis/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr ""
 
+#
 #: ../../share/compssUsers:999
 #, fuzzy
-msgid "Server"
-msgstr "serveris"
-
-#: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Person�g�s finanses"
-
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigur�cija"
+msgid "Internet gateway"
+msgstr "Interneta pieeja"
 
-#
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE darbastacija"
+msgid "Sound and video playing/editing programs"
+msgstr "Ska�as un video atska�o�anas/redi���anas programmas"
 
 #: ../../share/compssUsers:999
 msgid "Other Graphical Desktops"
 msgstr "Citas grafisk�s darbavirsmas"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Serveris, Pasts/Grupu r�ki/Jaunumi"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redaktori, �aulas, failu r�ki, termin��i"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome darbastacija"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programmas j�su finan�u p�rvald��anai, piem�ram, gnucach"
 
 #
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Interneta pieeja"
+msgid "Games"
+msgstr "Sp�les"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "R�ki darbam ar Palm Pilot vai Visor"
+msgid "Personal Information Management"
+msgstr "Person�g�s inform�cijas mened�ments"
 
 #
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Sp��u dators"
+msgid "Multimedia - CD Burning"
+msgstr "Multim�diji - CD ierakst��ana"
 
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm u.c."
+#, fuzzy
+msgid "Scientific Workstation"
+msgstr "Zin�tnisk� darbastacija"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "las��anai nevar atv�rt /etc/sysconfig/autologin: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Vai v�laties p�rstart�t t�klu"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Vai j�s piekr�tat?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Gatavojos p�rstart�t t�kla ier�ci:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Gatavojos p�rstart�t t�kla ier�ci %s. Vai piekr�tat?"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Tools to ease the configuration of your computer"
-msgstr "Vai v�laties izm��in�t �o konfigur�ciju?"
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "Ja vien j�s neesat p�rliecin�ts par citu izv�li, parasti ir j�izv�las\n"
+#~ "\"/dev/hda\" (prim�rais galvenais IDE disks) vai \"/dev/sda\" (pirmais\n"
+#~ "SCSI disks)."
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "R�ki pastam, jaunumiem, t�meklim, failu sa�em�anai un �atam"
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Eksist� sekojo�as drukas rindas.\n"
+#~ "J�s varat pievienot jaunass vai izmain�t eso��s."
+
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Savienojuma tips: "
+
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Nor�diet noklus�to lietot�ju:"
+
+#, fuzzy
+#~ msgid "Test the mouse here."
+#~ msgstr "L�dzu notest�jiet peli"
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr "L�dzu nor�diet v�lamo instal��anas un sist�mas izmanto�anas valodu."
+
+#~ 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 ""
+#~ "Lai turpin�tu instal��anu, jums ir j�pie�em ��s licences nosac�jumi.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nospiediet \"Pie�emt\", ja piekr�tat nosac�jumiem.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nospiediet \"Noraid�t\", ja nepiekr�tat nosac�jumiem. Instal��ana tiks "
+#~ "p�rtraukta bez pa�reiz�j�s\n"
+#~ "konfigur�cijas izmai��m."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Sarakst� nor�diet j�su tastat�rai atbilsto�u izk�rtojumu"
+
+#~ 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 ""
+#~ "Ja v�laties, lai citas valodas (iz�emot to, ko nor�d�j�t instal��anas\n"
+#~ "s�kum�) b�tu pieejamas p�c instal��anas, l�dzu nor�diet t�s augst�k\n"
+#~ "eso�aj� sarakst�. Ja v�laties izmantot visas, nospiediet \"Viss\"."
+
+#~ 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 ""
+#~ "Izv�lieties:\n"
+#~ "\n"
+#~ "  - Piel�gota: Ja pietiekami labi p�rzinat GNU/Linux, jums tiks dota\n"
+#~ "    iesp�ja nor�d�t sist�mu pielietojumu. S�k�ka inform�cija b�s\n"
+#~ "    pieejam v�l�k.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Eksperta: Noder�s, ja j�s labi p�rzinat GNU/Linux un v�laties veikt\n"
+#~ "    prec�zi piel�gotu instal�ciju. T�pat k� piel�gotas instal�cijas\n"
+#~ "    gad�jum�, jums tiks dota iesp�ja nor�d�t sist�mas pielietojumu.\n"
+#~ "    Tom�r l�dzu, NEIZV�LIETIES �O, JA J�S NEESAT P�RLIECIN�TS PAR\n"
+#~ "    SAVU R�C�BU!"
+
+#~ 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 ""
+#~ "Tagad jums ir j�nor�da ma��nas pielietojums. Varat izv�l�ties:\n"
+#~ "\n"
+#~ "* Darbastacija: �� ir ide�la izv�le, ja pl�nojat sist�mu galvenok�rt "
+#~ "izmantot ikdienas vajadz�b�m biroj� vai m�j�s.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Izstr�dei: ja pl�nojat sist�mu izmantot galvenok�rt programmat�ras "
+#~ "izstr�dei, �� ir laba izv�le. �aj�\n"
+#~ " gad�jum� tiks instal�ts pilns programmu komplekts, lai j�s var�tu "
+#~ "kompil�t, atk��dot un format�t s�kumkodu vai\n"
+#~ " veidot programmat�ras pakotnes.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Serveris: ja pl�nojat sist�mu izmantot k� serveri, �� ir laba izv�le. "
+#~ "Tas var b�t failu serveris (NFS vai\n"
+#~ " SMB), drukas serveris (Unix stila vai Microsoft Windows stila), "
+#~ "autentific��anas serveris (NIS),\n"
+#~ " datub�zu serveris utt. �aj� gad�jum� neceriet, ka tiks instal�ti k�di "
+#~ "izskaistin�jumi (KDE, GNOME, un tml.)."
+
+#~ 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 ""
+#~ "Tagad varat izv�l�ties instal�jamo vai uzlabojamo pakot�u grupu.\n"
+#~ "\n"
+#~ "\n"
+#~ "P�c tam DrakX p�rbaud�s, vai pietiek vietas to visu instal��anai.\n"
+#~ "Ja nav vietas, j�s br�din�s par to. Ja v�laties turpin�t, neskatoties\n"
+#~ "uz to, izv�l�to grupu instal��ana turpin�sies, ta�u tiks izlaistas\n"
+#~ "da�as maz�k noder�gas pakotnes. Saraksta apak�� varat izv�l�ties\n"
+#~ "opciju \"Atsevi��u pakot�u izv�le\"; �aj� gad�jum� jums vajadz�s\n"
+#~ "caurskat�t vair�k nek� 1000 pakot�u sarakstu..."
+
+#~ 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 ""
+#~ "Tagad j�s varat atsevi��i izv�l�ties visas pakotnes, ko gribat "
+#~ "insrtal�t.\n"
+#~ "\n"
+#~ "\n"
+#~ "J�s varat izv�str vai sak�aut koku, noklik��inot uz opcij�m pakot�u loga\n"
+#~ "kreisaj� st�r�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ja j�s v�laties redz�t visas sakotnes sak�rtotas alfab�ta sec�b�,\n"
+#~ "noklik��iniet uz ikonas \"Sak�rtots vien� sarakst� vai pa grup�m\"\n"
+#~ "\n"
+#~ "\n"
+#~ "Ja j�s nev�laties, lai j�s br�dina par atkar�b�m, noklik��iniet uz\n"
+#~ "\"Autom�tiskas atkar�bas\". Ja j�s t� izdar�t, �emiet v�r�, ka "
+#~ "atteik�an�s\n"
+#~ "no vienas pakotnes var izsaukt atteik�anos no vair�k�m cit�m pakotn�m,\n"
+#~ "kas ir no t�s atkar�gas."
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ 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 ""
+#~ "Ja jums ir visi �aj� sarakst� nor�d�tie CD, nospiediet Labi.\n"
+#~ "Ja jums nav neviena no nor�d�tajiem CD, nospiediet Atcelt.\n"
+#~ "Ja tr�kst tikai da�u CD, sarakst� atsl�dziet tos un nospiediet Labi."
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ 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 ""
+#~ "Ja v�laties savu datoru piesl�gt Internetam vai lok�lam datort�klam,\n"
+#~ "l�dzu izv�lieties pareizu opciju. L�dzu vispirms iesl�dziet attiec�gu\n"
+#~ "ier�ci, pirms izv�laties opciju, lai DrakX noteiktu to autom�tiski.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ja jums nav nek�da piesl�guma Internetam vai lok�lam datort�klam,\n"
+#~ "izv�lieties \"Atsl�gt t�klu\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ja j�s v�laties konfigur�t t�klu v�l�k p�c instal��anas, vai ar� esat\n"
+#~ "jau pabeigu�i konfigur�t j�su t�kla piesl�gumu, izv�lieties \"Izdar�ts\"."
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ 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 ""
+#~ "Mod�ms nav atrasts. L�dzu nor�diet, kuram seri�lajam portam tas "
+#~ "piesl�gts.\n"
+#~ "\n"
+#~ "\n"
+#~ "J�su zin��anai, pirmais seri�lais ports (ko Microsoft Windows sauc par\n"
+#~ "\"COM1\") Linux vid� tiek saukts par \"ttyS0\"."
 
-#~ msgid "%d minutes"
-#~ msgstr "%d min�tes"
+#~ 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 ""
+#~ "Tagad j�s varat ievad�t iezvanpieejas opcijas. Ja j�s nezinat vai neesat\n"
+#~ "p�rliecin�ts, ko ievad�t, pareizu inform�ciju var sa�emt no j�su "
+#~ "Interneta\n"
+#~ "pakalpojumu sniedz�ja. Ja j�s �eit neievad�t DNS (v�rdu servera) "
+#~ "inform�ciju,\n"
+#~ "�� inform�cija tiks ieg�ta no j�su Interneta pakalpojumu sniedz�ja\n"
+#~ "piesl�g�an�s laik�."
 
-#~ msgid "1 minute"
-#~ msgstr "1 min�te"
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Ja jums ir �r�js mod�ms, l�dzu iesl�dziet to un �aujiet DrakX to noteikt "
+#~ "autom�tiski."
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sekundes"
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "L�dzu iesl�dziet j�su mod�mu un nor�diet pareizo modeli."
+
+#~ 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 ""
+#~ "Ja j�s neesat p�rliecin�ts, vai augst�k eso�� inform�cija ir pareiza, "
+#~ "vai\n"
+#~ "ar� j�s nezinat vai neesat p�rliecin�ts, ko ievad�t, pareizu inform�ciju\n"
+#~ "var sa�emt no j�su Interneta pakalpojumu sniedz�ja. Ja j�s �eit "
+#~ "neievad�t\n"
+#~ "DNS (v�rdu servera) inform�ciju, �� inform�cija tiks ieg�ta no j�su\n"
+#~ "Interneta pakalpojumu sniedz�ja piesl�g�an�s laik�."
+
+#~ 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 ""
+#~ "Tagad varat ievad�t j�su datora v�rdu, ja tas nepiecie�amas.\n"
+#~ "Ja j�s to nezinat vai neesat p�rliecin�ts, ko ievad�t, pareizu "
+#~ "inform�ciju\n"
+#~ "var sa�emt no j�su Interneta pakalpojumu sniedz�ja."
+
+#~ 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 ""
+#~ "Tagad varat konfigur�t t�kla ier�ci.\n"
+#~ "\n"
+#~ "   * IP adrese: ja to nezinat vai neesat p�rliecin�ts, pajaut�jiet t�kla "
+#~ "administratoram.\n"
+#~ "     Jums nav j�ievada IP adrese, ja zem�k izv�laties \"Autom�tisks IP"
+#~ "\".\n"
+#~ "\n"
+#~ "  - T�klamaska: \"255.255.255.0\" parasti ir laba izv�le. Ja nezinat vai "
+#~ "neesat p�rliecin�ts, pajaut�jiet\n"
+#~ "t�kla administratoram.\n"
+#~ "\n"
+#~ "  - Autom�tisks IP: ja j�su datort�kls izmanto BOOTP vai DHCP protokolu, "
+#~ "izv�lieties �o opciju. Kad t� izv�l�ta,nnav j�nor�da \"IP addrese\". Ja "
+#~ "nezinat vai neesat p�rliecin�ts, pajaut�jiet t�kla administratoram."
+
+#~ 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 ""
+#~ "Tagad varat ievad�t j�su datora v�rdu, ja tas nepiecie�amas.\n"
+#~ "Ja j�s to nezinat vai neesat p�rliecin�ts, pajaut�jiet t�kla "
+#~ "administratoram."
+
+#~ 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 ""
+#~ "Tagad varat ievad�t j�su datora v�rdu, ja tas nepiecie�ams.\n"
+#~ "Ja nezinat vai neesat p�rliecin�ts, atst�jiet tuk�u."
+
+#~ 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 ""
+#~ "Tagad j�s varat ievad�t iezvan��an�s opcijas. Ja j�s nezinat, ko "
+#~ "ievad�t,\n"
+#~ "vajadz�go inform�ciju var sa�emt no j�su 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 ""
+#~ "Ja j�s izmantosit proxy serverus, l�dzu konfigur�jiet tos. Ja j�s\n"
+#~ "nezinat, vai izmantosit proxy, pajaut�jiet t�kla administratoram vai\n"
+#~ "savam ISP."
+
+#~ 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 ""
+#~ "Ja j�su Interneta piesl�gums ir konfigur�ts pareizi, j�s varat instal�t\n"
+#~ "kriptogr�fijas pakotnes. Vispirms nor�diet spogu�serveri, no kura\n"
+#~ "iel�d�t pakotnes, tad izv�lieties instal�jam�s pakotnes.\n"
+#~ "\n"
+#~ "\n"
+#~ "Atcerieties, ka spogu�serveris un kriptogr�fijas pakotnes ir j�izv�las\n"
+#~ "atbilsto�i j�su valsts likumdo�anai."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "Tagad varat nor�d�t laika joslu, kur� j�s dz�vojat."
+
+#~ 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 ""
+#~ "J�s varat konfigur�t lok�lu printeri (kas piesl�gts j�su datoram) vai\n"
+#~ "att�lu printeri (pieejami Unix, Netware vai Microsoft Windows t�kl�)."
+
+#~ 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 ""
+#~ "Ja j�s v�laties izmantot printeri, izv�lieties vienu no drukas sist�m�m "
+#~ "- \n"
+#~ "CUPS vai LRP.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS ir jauna, jaud�ga un elast�ga drukas sist�ma Unix sist�m�m (CUPS\n"
+#~ "noz�m� \"Common Unix Printing System\"). �� ir noklus�t� Mandrake Linux\n"
+#~ "drukas sist�ma.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR ir vec� drukas sist�ma, kas tika izmantota iepriek��j�s Mandrake "
+#~ "Linux\n"
+#~ "versij�s.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ja jums nav printera, izv�lieties \"Neviens\"."
+
+#~ 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 var str�d�t ar da��diem printeru tipiem. Katram no �iem tipiem\n"
+#~ "ir nepiecie�ama at��ir�gi uzst�d�jumi.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ja j�su printeris ir fiziski piesl�gts j�su datoram, izv�lieties "
+#~ "\"Lok�ls\n"
+#~ "printeris\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ja j�s v�laties piek��t printerim, kas ir piesl�gts att�lam Microsoft\n"
+#~ "Windows datoram (vai Unix datoram, kas izmanto SMB protokolu), "
+#~ "izv�lieties\n"
+#~ "\"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 ""
+#~ "L�dzu iesl�dziet j�su printeri, pirms turpin�t un �aut DrakX to noteikt.\n"
+#~ "\n"
+#~ "�eit jums ir j�ievada noteikta inform�cija.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Printera nosaukums: drukas spol�t�js izmanto \"lp\" k� noklus�to "
+#~ "printera nosaukumu, t�p�c jums ir j�b�t\n"
+#~ "     printerim, kas saucas \"lp\". Ja jums ir tikai viens printeris, j�s "
+#~ "varat tam pie��irt vair�kus nosaukumus.\n"
+#~ "     Nosaukumi ir j�atdala ar vertik�las sv�tras simbolu (\"|\"). "
+#~ "T�d�j�di, ja j�s gribat izmantot saprotam�ku\n"
+#~ "     nosaukumu, j�s to varat nor�d�t pirmo, piem�ram, \"Mans printeris|lp"
+#~ "\". Printeris, kura nosaukum� ir \"lp\",\n"
+#~ "     b�s noklus�tais printeris.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Apraksts: nav oblig�ts, bet var noder�t, ja j�su datoram ir "
+#~ "piesl�gti vair�ki printeri, vai ar� j�s gribat\n"
+#~ "     at�aut citiem datoriem piesl�gties j�su printerim.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Atra�an�s vieta: ja gribat, varat sniegt inform�ciju par j�su "
+#~ "printera\n"
+#~ "     atra�an�s vietu (�eit j�s varat rakst�t visu, ko v�laties, "
+#~ "piem�ram,\n"
+#~ "     \"otraj� st�v�\").\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 ""
+#~ "�eit jums ir j�ievada noteikta inform�cija.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Rindas nosaukums: drukas spol�t�js izmanto \"lp\" k� noklus�t� "
+#~ "printera nosaukumu, t�p�c jums ir j�b�t\n"
+#~ "     printerim, kas saucas \"lp\". Ja jums ir tikai viens printeris, j�s "
+#~ "varat tam pie��irt vair�kus nosaukumus.\n"
+#~ "     Nosaukumi ir j�atdala ar vertik�las sv�tras simbolu (\"|\"). "
+#~ "T�d�j�di, ja j�s gribat izmantot saprotam�ku\n"
+#~ "     nosaukumu, j�s to varat nor�d�t pirmo, piem�ram, \"Mans printeris|lp"
+#~ "\". Printeris, kura nosaukum� ir \"lp\",\n"
+#~ "     b�s noklus�tais printeris.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Spol��anas katalogs: tie�i �aj� katalog� tiek glab�ti drukas "
+#~ "uzdevumi. Ja nezinat, ko ievad�t,\n"
+#~ "     atst�jiet noklus�to v�rt�bu\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Printera piesl�gums: Ja j�su printeris fiziski ir piesl�gts j�su "
+#~ "datoram, izv�lieties \"Lok�ls printeris\".\n"
+#~ "     Ja j�s v�laties piek��t printerim, kas piesl�gts att�lam Unix "
+#~ "datoram, izv�lieties \"Att�ls lpd printeris\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Ja j�s v�laties izmantot printeri, kas piesl�gts att�lam Microsoft "
+#~ "Windows datoram (vai Unix datoram, kas\n"
+#~ "     izmanto SMB protokolu), izv�lieties \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Ja j�s v�laties izmantot printeri, kas atrodas NetWare t�kl�, "
+#~ "izv�lieties \"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 ""
+#~ "J�su printeris nav atrasts. L�dzu ievadiet ier�ces nosaukumu, kurai tas "
+#~ "ir\n"
+#~ "piesl�gts.\n"
+#~ "\n"
+#~ "\n"
+#~ "J�su zin��anai, vairums printeru ir piesl�gti pirmajam paral�lajam "
+#~ "portam.\n"
+#~ "�o portu GNU/Linux vid� sauc par \"/dev/lp0\" bet Microsoft Windows vid�\n"
+#~ "par \"LPT1\"."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Tagad jums ir j�izv�l�s printeri no augst�k eso�� saraksta."
+
+#~ 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 ""
+#~ "L�dzu izv�lieties j�su printerim atbilsto�as opcijas.\n"
+#~ "Izlasiet dokument�ciju, ja nezinat, ko izv�l�ties.\n"
+#~ "\n"
+#~ "\n"
+#~ "N�kamaj� sol� j�s var�sit p�rbaud�t izv�l�to konfigur�ciju un izmain�t "
+#~ "to,\n"
+#~ "ja printeris nedarbosies pareizi."
+
+#~ 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 ""
+#~ "Tagad varat ievad�t j�su Mandrake Linux sist�mas root paroli.\n"
+#~ "Parole ir j�ievada divas reizes, lai p�rliecin�tos, ka abas kopijas\n"
+#~ "sakr�t un j�s neesat k��d�jies.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root ir sist�mas administrators un vien�gais lietot�js, kam ir at�auts\n"
+#~ "izmain�t sist�mas konfigur�ciju. �� iemesla d�� r�p�gi izv�lieties �o\n"
+#~ "paroli! Neautoriz�ta root konta izmanto�ana var b�t �oti b�stama\n"
+#~ "sist�mas integrit�tei, t�s datiem un cit�m tai piesl�gtaj�m sist�m�m.\n"
+#~ "\n"
+#~ "\n"
+#~ "Parolei ir j�b�t vismaz 8 simbolus garai burtu un ciparu kombin�cijai.\n"
+#~ "To nekad nevajadz�tu pierakst�t uz pap�ra.\n"
+#~ "\n"
+#~ "\n"
+#~ "Neizv�lieties p�r�k garu vai sare���tu paroli: jums to ir\n"
+#~ "j�sp�j atcer�ties bez p�r�k lielas piep�les."
+
+#~ 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 ""
+#~ "Tagad j�s varat pievienot vienu vai vair�kus \"parastu\" lietot�ju\n"
+#~ "kontus k� pretstatu \"privili��ta\" lietot�ja kontam root. Varat "
+#~ "izveidot\n"
+#~ "vienu vai vair�kus kontus katrai personai, kam b�s at�auts izmantot\n"
+#~ "j�su datoru. Atcerieties, ka katram lietot�ja kontam ir sava\n"
+#~ "konfigur�cija (grafisk� vide, programmu konfigur�cija un tml.) un savs\n"
+#~ "\"m�jas katalogs\", kur� �� konfigur�cija tiek glab�ta.\n"
+#~ "\n"
+#~ "\n"
+#~ "Vispirms izveidojiet kontu pats sev! Pat ja j�s b�sit vien�gais\n"
+#~ "datora lietot�js, j�s NEDR�KSTAT ikdien� lietot root kontu: tas ir �oti\n"
+#~ "liels dro��bas risks. �oti bie�i tikai da�i nepareizi nodruk�ti burti\n"
+#~ "var padar�t j�su sist�mu nelietojamu.\n"
+#~ "\n"
+#~ "\n"
+#~ "�� iemesla d�� jums j�iere�istr�jas sist�m�, izmantojot lietot�ja kontu,\n"
+#~ "ko j�s t�l�t izveidosit, un j�iere�istr�jas k� root tikai "
+#~ "administr��anas\n"
+#~ "un uztur��anas uzdevumu veik�anai."
+
+#~ 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 ""
+#~ "Ir �oti ieteicams izveidot s�kn��anas disketi. Ja jums neizdosies "
+#~ "start�t\n"
+#~ "savu datoru, t� b�s vien�gais veids, k� to izgl�bt bez p�rinstal��anas."
+
+#, 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 un grub galven�s opcijas ir:\n"
+#~ "  - S�kn��anas ier�ce: Nor�da ier�ces nosaukumu (t.i., ciet� diska\n"
+#~ "part�ciju), uz kuras atrodas s�kn��anas sektors. Ja vien neesat\n"
+#~ "p�rliecin�ts par ko citu, izv�lieties \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Pauze pirms noklus�t� att�la s�kn��anas: Nor�da laiku sekundes\n"
+#~ "desmitda��s, ko s�kn�t�js gaida pirms pirm� att�la iel�des.\n"
+#~ "Tas ir ieteicams sist�m�m, kas s�kn�jas tie�i no ciet� diska t�l�t p�c\n"
+#~ "tastat�ras aktiviz��anas. S�kn��ana s�kas bez pauzes, ja \"pauze\" nav\n"
+#~ "nor�d�ta vai ir nulle.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video re��ms: Tas nor�da VGA teksta re��mu, kas tiek izv�l�ts\n"
+#~ "s�kn��anas laik�. Ir pieejamas sekojo�as v�rt�bas: \n"
+#~ "    * norm�ls: izv�las norm�lu 80x25 teksta re��mu.\n"
+#~ "    * <skaitlis>:  izmanto atbilsto�u teksta re��mu."
+
+#~ 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 ir s�kn�t�js SPARC sist�m�m: tas sp�j s�kn�t GNU/Linux\n"
+#~ "vai jebkuru citu oper�t�jsist�mu, kas ir uzst�d�ta j�su dator�.\n"
+#~ "Parasti citas oper�t�jsist�mas tiek korekti noteiktas un instal�tas.\n"
+#~ "Ja t� nenotiek, j�s �aj� ekr�n� varat ar roku pievienot ierakstu. Esiet\n"
+#~ "uzman�gs, izv�loties pareizus parametrus.\n"
+#~ "\n"
+#~ "\n"
+#~ "J�s varb�t ar� v�laties ne�aut nevienam piek��t p�r�j�m "
+#~ "oper�t�jsist�m�m,\n"
+#~ "un �aj� gad�jum� j�s varat izdz�st attiec�gos ierakstus. Bet �aj�\n"
+#~ "gad�jum� jums b�s nepiecie�ama s�kn��anas diskete, lai t�s s�kn�tu!"
+
+#~ 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 galven�s opcijas ir:\n"
+#~ "  - S�kn�t�ja instal��ana: Nor�da, kur j�s v�laties novietot "
+#~ "inform�ciju,\n"
+#~ "kas nepiecie�ama GNU/Linux s�kn��anai. Ja vien neesat p�rliecin�ts\n"
+#~ "par ko citu, izv�lieties \"Diska pirmais sektors (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Pauze pirms noklus�t� att�la s�kn��anas: Nor�da laiku sekundes\n"
+#~ "desmitda��s, ko s�kn�t�js gaida pirms pirm� att�la iel�des.\n"
+#~ "Tas ir ieteicams sist�m�m, kas s�kn�jas tie�i no ciet� diska t�l�t p�c\n"
+#~ "tastat�ras aktiviz��anas. S�kn��ana s�kas bez pauzes, ja \"pauze\" nav\n"
+#~ "nor�d�ta vai ir nulle."
+
+#~ 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 ""
+#~ "Ir pien�cis laiks konfigur�t X Window System, kas ir GNU/Linux GUI\n"
+#~ "(grafisk� lietot�ja interfeisa) pamats. Lai to izdar�tu, jums ir\n"
+#~ "j�konfigur� video karte un monitors. Tom�r vairums no �iem so�iem ir\n"
+#~ "automatiz�ti, t�p�c j�su uzdevums var b�t tikai p�rbaud�t izdar�to\n"
+#~ "izv�li un apstiprin�t parametrus :)\n"
+#~ "\n"
+#~ "\n"
+#~ "Kad konfigur��ana ir pabeigta, tiks start�ts X (ja vien j�s\n"
+#~ "nel�dzat DrakX to nedar�t), lai j�s p�rbaud�tu un apskat�tu, vai\n"
+#~ "parametri j�s apmierina. Ja tie neder, j�s varat atgriezties un tos\n"
+#~ "nomain�t tik reizes, cik b�s nepiecie�ams."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Ja ar X konfigur�ciju kaut kas nav k�rt�b�, izmantojiet ��s opcijas,\n"
+#~ "lai pareizi konfigur�tu X Window System."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Ja dodat priek�roku darba uzs�k�anai grafisk� re��m�, izv�lietis \"J�\",\n"
+#~ "cit�di izv�lieties \"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 ""
+#~ "J�su sist�ma tiks p�rstart�ta.\n"
+#~ "\n"
+#~ "P�c p�rstart��anas j�su jaun� Mandrake Linux sist�ma tiks iel�d�ta\n"
+#~ "autom�tiski. Ja v�laties s�kn�t k�du citu jau uzst�d�tu oper�t�jsist�mu,\n"
+#~ "l�dzu izlasiet papildus nor�d�jumus."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "�ehijas (programm�t�ju)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slov�kijas (programm�t�ju)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Veidojam� profila nosaukums:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Ierakst�t /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Atjaunot no faila"
+
+#~ msgid "Save in file"
+#~ msgstr "Saglab�t fail�"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Atjanot no disketes"
+
+#~ msgid "Format all"
+#~ msgstr "Format�t visu"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "P�c visu part�ciju format��anas"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "visi ��j�s part�cij�s eso�ie dati tiks pazaud�ti"
+
+#~ msgid "Reload"
+#~ msgstr "P�rl�d�t"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr "Vai v�laties izveidot auto instal��anas disketi linux replik�cijai?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL konfigur�cija"
+
+#~ 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 ""
+#~ "Izmantojot att�lu CUPS serveri, �eit jums nav nepiecie�ams\n"
+#~ "konfigur�t nevienu printeri. Printeri tiks atrasti autom�tiski,\n"
+#~ "ja vien serveris nav piesl�gts citam t�klam; t�d� gad�jum� jums\n"
+#~ "ir j�nor�da CUPS servera IP adrese un, iesp�jams, porta numurs."
+
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Att�l� rinda"
+
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "Dom�na nosaukums"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Nav printera"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "ierobe�ot"
+
+#, fuzzy
+#~ msgid "Network Monitoring"
+#~ msgstr "T�kla konfigur�cija"
+
+#~ msgid "Profile "
+#~ msgstr "Profils "
+
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "Savienojuma tips: "
+
+#, fuzzy
+#~ msgid "Connecting to Internet "
+#~ msgstr "Piesl�gties Internetam"
+
+#, fuzzy
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Atsl�gties no Interneta"
+
+#, fuzzy
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Atsl�gties no Interneta"
+
+#, fuzzy
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Atsl�gties no Interneta"
+
+#, fuzzy
+#~ msgid "Connection complete."
+#~ msgstr "Savienojuma nosaukums"
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "Konfigur�cija"
+
+#, fuzzy
+#~ msgid "Connect"
+#~ msgstr "Nav piesl�gts"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "ISDN piesl�gums"
+
+#~ msgid "/File/_New"
+#~ msgstr "/Fails/_Jauns"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Fails/_Atv�rt"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Fails/_Saglab�t"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Fails/Saglab�t _k�"
+
+#~ msgid "/File/-"
+#~ msgstr "/Fails/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Opcijas"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Opcijas/Tests"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Pal�dz�ba"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Pal�dz�ba/_Par..."
+
+#, fuzzy
+#~ msgid "Default Runlevel"
+#~ msgstr "Noklus�ts"
+
+#~ msgid "Europe"
+#~ msgstr "Eiropa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "No�emt rindu"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Konfigur�cijas faila saturu neizdodas saprast."
+
+#~ msgid "Adapter"
+#~ msgstr "Adapteris"
+
+#, fuzzy
+#~ msgid "Disable network"
+#~ msgstr "Atsl�gt"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "Iesl�gt"
+
+#~ 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 ""
+#~ "Tagad varat izm��in�t peli. Izmantojiet pogas un riteni, lai\n"
+#~ "p�rliecin�tos, ka konfigur�cija ir pareiza. Ja nav, varat nospiest\n"
+#~ "\"Atcelt\" un izv�l�ties citu draiveri."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (vai ADSL) piesl�gums"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Pele"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "J�s varat tie�i nor�d�t URI, lai piek��tu printerim ar CUPS."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "J�, izdruk�t ASCII izm��in�juma lapu"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "J�, izdruk�t PostScript izm��in�juma lapu"
+
+#~ msgid "Paper Size"
+#~ msgstr "Pap�ra izm�rs"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Vai izmest lapu p�c izdrukas?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Uniprint draivera opcijas"
+
+#~ msgid "Color depth options"
+#~ msgstr "Kr�su dzi�uma opcijas"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Druk�t tekstu k� PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Vai labot teksta k�p�veida izdruku?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Lappu�u skaits vien� izdrukas lap�"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Lab�/Kreis� mala punktos (1/72 collas da��s)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Aug��j�/Apak��j� mala punktos (1/72 collas da��s)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Papildus GhostScript opcijas"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Papildus teksta opcijas"
+
+#~ msgid "Reverse page order"
+#~ msgstr "A�g�rna lappu�u sec�ba"
+
+#~ msgid "CUPS starting"
+#~ msgstr "CUPS start��ana"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Izv�lieties att�la printera piesl�gumu"
+
+#~ 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 ""
+#~ "Katram printerim ir nepiecie�ams nosaukums (piem�ram, lp).\n"
+#~ "Var nor�d�t ar� citus parametrus, piem�ram, printera aprakstu vai t�\n"
+#~ "atra�an�s vietu. K�du nosaukumu pie��irt �im printerim, un k�d� veid�\n"
+#~ "printeris ir piesl�gts?"
+
+#~ 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 ""
+#~ "Katrai drukas rindai (uz kuru tiek adres�ti drukas uzdevumi) ir "
+#~ "nepiecie�ams\n"
+#~ "nosaukums (bie�i lp) un tai piesaist�ts spol��anas katalogs. K�du "
+#~ "nosaukumu\n"
+#~ "un katalogu izmantot �ai rindai un k� ir piesl�gts printeris?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Rindas nosaukums"
+
+#~ msgid "Spool directory"
+#~ msgstr "Spol��anas katalogs"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Lai palielin�tu sist�mas dro��bu, izv�lieties \"Izmantot shadow failu\"\n"
+#~ "un \"Izmantot MD5 paroles\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Ja j�su t�kl� lieto NIS, izv�lieties \"Izmantot NIS\". Ja j�s to nezinat\n"
+#~ "pajaut�jiet savam t�kla administratoram."
+
+#~ msgid "yellow pages"
+#~ msgstr "dzelten�s lapas"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "LAN konfigur�cija"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "Pakalpojumu sniedz�ja dns 1"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "Pakalpojumu sniedz�ja dns 2"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "K� j�s v�laties piesl�gties Internetam?"
 
 #, fuzzy
 #~ msgid "Lilo/Grub configuration"
@@ -7985,14 +9754,6 @@ msgstr "R�ki pastam, jaunumiem, t�meklim, failu sa�em�anai un �atam"
 #~ msgid "Configure..."
 #~ msgstr "Konfigur�ju..."
 
-#, fuzzy
-#~ msgid "Standard tools"
-#~ msgstr "Standarta"
-
-#, fuzzy
-#~ msgid "Configuration de Lilo/Grub"
-#~ msgstr "Konfigur�cija"
-
 #~ msgid "This startup script try to load your modules for your usb mouse."
 #~ msgstr "�is start��anas skripts m��ina iel�d�t modu�us j�su usb pelei."
 
@@ -8123,9 +9884,6 @@ msgstr "R�ki pastam, jaunumiem, t�meklim, failu sa�em�anai un �atam"
 #~ msgid "Internet/Network access"
 #~ msgstr "Internets/Pieeja t�klam"
 
-#~ msgid "Mail information"
-#~ msgstr "Pasta inform�cija"
-
 #, fuzzy
 #~ msgid "Firewall Configuration Wizard"
 #~ msgstr "T�kla konfigur��anas meistars"
@@ -8200,12 +9958,6 @@ msgstr "R�ki pastam, jaunumiem, t�meklim, failu sa�em�anai un �atam"
 #~ msgid "Development, Standard tools"
 #~ msgstr "Izstr�de, Standartr�ki"
 
-#~ msgid "eth$_"
-#~ msgstr "eth$_"
-
-#~ msgid "None"
-#~ msgstr "Nevienu"
-
 #~ msgid "Which bootloader(s) do you want to use?"
 #~ msgstr "Kuru(s) s�kn�t�ju(s) v�laties izmantot?"
 
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index be46e0aee..683964eec 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 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: 2001-09-21 10:22+0200\n"
 "Last-Translator: Andreas Bergstr�m <abergstr@halden.net>\n"
 "Language-Team: Norsk\n"
@@ -6678,7 +6678,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/pl.po b/perl-install/share/po/pl.po
index 3a2b9bf56..a18db98a1 100644
--- a/perl-install/share/po/pl.po
+++ b/perl-install/share/po/pl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: 2001-06-05 14:21GMT+0200\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-08-10 10:57GMT+0200\n"
 "Last-Translator: Pawel Jablonski <pj@linux-mandrake.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,24 +15,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
 msgstr "Konfiguruj wszystkie monitory niezale�nie"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "U�yj rozszerzenia Xinerama"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Konfiguruj tylko kart� \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Konfiguracja wielomonitorowa"
 
-#: ../../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 ""
 "Tw�j system obs�uguje wiele monitor�w.\n"
 "Co chcesz zrobi�?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Karta graficzna"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Wybierz kart� graficzn�"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Wybierz X serwer"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X serwer"
 
-#: ../../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 "Kt�r� konfiguracj� XFree chcesz mie�?"
 
-#: ../../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,17 +76,18 @@ msgstr ""
 "Twoja karta jest obs�ugiwana przez XFree %s, gdzie mo�e by� wydajniejsza "
 "obs�uga 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 "Dla Twojej karty akceleracja 3D jest obs�ugiwana tylko przez 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 z obs�ug� sprz�towej akceleracji 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 ""
 "Dla Twojej karty akceleracja 3D jest obs�ugiwana przez XFree %s.\n"
 "JEST TO ROZWI�ZANIE EKSPERYMENTALNE, MO�E ZAWIESI� KOMPUTER."
 
-#: ../../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 z EKSPERYMENTALN� obs�ug� sprz�towej akceleracji 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"
@@ -112,27 +113,31 @@ msgstr ""
 "Twoja karta jest obs�ugiwana przez XFree %s, gdzie mo�e by� wydajniejsza "
 "obs�uga 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr "Xpmac (installation display driver)"
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "Konfiguracja XFree"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Okre�l rozmiar pami�ci karty graficznej"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Wybierz opcje serwera"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Wybierz 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"
@@ -155,39 +160,39 @@ msgstr ""
 "poniewa� mo�e to spowodowa� jego uszkodzenie.\n"
 "Je�li masz w�tpliwo�ci, wybierz zachowawcze ustawienia."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Cz�stotliwo�� synchronizacji poziomej"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Cz�stotliwo�� synchronizacji pionowej"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Nie skonfigurowano monitora"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Nie skonfigurowano jeszcze karty graficznej"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Nie okre�lono jeszcze rozdzielczo�ci"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Chcesz przetestowa� t� konfiguracj�?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Ostrze�enie: testowanie tej karty mo�e zawiesi� komputer"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Test konfiguracji"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -195,152 +200,156 @@ msgstr ""
 "\n"
 "spr�buj zmieni� jakie� parametry"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Wyst�pi� b��d:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Pozostalo %d sekund"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Czy te ustawienia sa prawidlowe?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Wyst�pi� b��d, spr�buj zmieni� jakie� parametry"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Rozdzielczo��"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Okre�l rozdzielczo�� oraz g��bi� kolor�w"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Karta graficzna: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Serwer 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 "Tryb eksperta"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Poka� wszystkie"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Rozdzielczo�ci"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Uk�ad klawiatury: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Typ myszy: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Port myszy: %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 "Synchronizacja pozioma monitora: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Synchronizacja pionowa monitora: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Karta graficzna: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Karta graficzna: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Pami�� karty: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Ilo�� kolor�w: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rozdzielczo��: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Serwer XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "Sterownik XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Przygotowywanie konfiguracji X-Window"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Co chcesz zrobi�?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Zmieni� monitor"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Zmieni� kart� graficzn�"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Zmieni� opcje serwera"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Zmieni� rozdzielczo��"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Obejrze� informacje"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Przetestowa� ponownie"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Wyj��"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -353,20 +362,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "By uaktywni� zmiany zaloguj si� ponownie do %s"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Wyloguj si� i u�yj kombinacji klawiszy Ctrl-Alt-BackSpace "
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X przy uruchomieniu "
 
-#: ../../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,214 +429,222 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB lub wi�cej"
+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 lub wi�cej"
+
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standardowa VGA, 640x480 przy 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 przy 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "Zgodny z 8514, 1024x768 przy 87 Hz z przeplotem (bez 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 przy 87 Hz z przeplotem, 800x600 in 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 "Rozszerzona SVGA, 800x600 przy 60 Hz, 640x480 przy 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 bez przeplotu, 1024x768 przy 60 Hz, 800x600 przy 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Wysokocz�stotliwo�ciowy SVGA, 1024x768 przy 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Wielocz�stotliwo�ciowy do 1280x1024 przy 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Wielocz�stotliwo�ciowy do 1280x1024 przy 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Wielocz�stotliwo�ciowy do 1280x1024 przy 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor do 1600x1200 przy 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor do 1600x1200 przy 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 "Pierwszy sektor na partycji startowej"
 
-#: ../../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 "Pierwszy sektor na dysku (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "Instalacja 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 "Gdzie chcesz zainstalowa� program rozruchowy?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "Instalacja 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 z menu tekstowym"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO z menu graficznym"
 
-#: ../../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 "Start z 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 "Podstawowe opcje programu rozruchowego"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "U�yty program rozruchowy"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Instalacja programu rozruchowego"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Urz�dzenie startowe"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nie funkcjonuje ze starszymi BIOSami)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Odczytuj du�e bloki"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "du�e bloki"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Tryb video"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Op�nienie przed uruchomieniem domy�lnego systemu"
 
-#: ../../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 "Has�o"
 
-#: ../../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 "Has�o (powt�rnie)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Ograniczenie opcji linii komend"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "ograniczenie"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Wyczy�ci� /tmp przy ka�dym starcie systemu"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Okre�l rozmiar pami�ci, je�li trzeba (znaleziono %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "W��czy� profile sprz�towe?"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Podaj rozmiar pami�ci w MB"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "Opcja \"Ograniczenie opcji linii komend\" nie dzia�a bez has�a"
 
-#: ../../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 "Prosz� spr�bowa� ponownie"
 
-#: ../../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 "Has�a nie zgadzaj� si�"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Komunikat startowy"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Open Firmware Delay"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Op�nienie uruchamiania"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Uaktywni� uruchamianie z CD?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Enable OF Boot?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Domy�lny system?"
 
-#: ../../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."
@@ -635,145 +652,144 @@ msgstr ""
 "Masz nast�puj�ce pozycje.\n"
 "Mo�esz doda� nast�pne lub zmieni� istniej�ce."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../../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 "Zrobione"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 msgid "Modify"
 msgstr "Modyfikuj"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Jakiego typu pozycj� chcesz doda�?"
 
-#: ../../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 "Inny system operacyjny (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Inny system operacyjny (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Inny system operacyjny (Windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Obraz"
 
-#: ../../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 "Do��cz"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Startowy ramdysk"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Zapis-odczyt"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tabela"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Niebezpieczne"
 
-#: ../../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 "Etykieta"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Domy�lne"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Rozmiar startowego ramdysku"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "brak video"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Usu� pozycj�"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Pusta etykieta jest niedozwolona"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Ta etykieta jest ju� u�ywana"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Okre�l spos�b partycjonowania."
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Znaleziono %s  %s interfejs�w"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Masz inne?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Czy masz interfejs %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 "Nie"
 
-#: ../../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 "Tak"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Poka� informacj� o sprz�cie"
 
 #. -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 "Instalacja sterownika do karty %s %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(modu� %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 "Kt�ry sterownik %s wypr�bowa�?"
 
-#: ../../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,20 +807,20 @@ msgstr ""
 "Czasami wykrywanie mo�e zawiesi� komputer, nie powoduje to\n"
 "jednak �adnych problem�w (utraty danych)."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Autodetekcja"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Okre�l parametry"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Mo�esz teraz okre�li� parametry modu�u %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -815,11 +831,11 @@ msgstr ""
 "S� one w formacie \"nazwa1=warto��1 nazwa2=warto��2 ...\n"
 "Np. \"io=0x300 irq=7\" "
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Opcje modu�u:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -828,34 +844,34 @@ msgstr ""
 "Nieudane za�adowanie modu�u %s.\n"
 "Chcesz spr�bowa� z innymi parametrami?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(ju� dodano %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Has�o jest zbyt proste"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Prosz� poda� nazw� u�ytkownika"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Nazwa u�ytkownika mo�e sk�ada� si� tylko  z ma�ych liter, cyfr, `-'i `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Ten u�ytkownik zosta� ju� dodany"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Dodaj u�ytkownika"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -864,53 +880,67 @@ msgstr ""
 "Podaj dane u�ytkownika\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Akceptuj u�ytkownika"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Nazwisko"
 
-#: ../../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 "Identyfikator:"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Pow�oka"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Automatyczne logowanie"
 
-#: ../../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 ""
 "Mo�na skonfigurowa� komputer, by automatycznie logowa� u�ytkownika\n"
 "w systemie. Je�li nie chcesz korzysta� z tej mo�liwo�ci, wybierz Anuluj."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Wybierz domy�lnego u�ytkownika:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Wybierz uruchamiane �rodowisko graficzne:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Wybierz j�zyk u�ywania systemu"
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr ""
+"Mo�esz wybra� inne j�zyki, kt�re chcesz mie� do dyspozycji po instalacji"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Wszystkie"
+
 # 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 +965,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 "Witamy w programie wybierajacym system - GRUB!"
 
@@ -949,7 +979,7 @@ msgstr "Witamy w programie wybierajacym system - 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 "Uzyj %c i %c klawiszy , aby podswietlic pozycje."
@@ -964,7 +994,7 @@ msgstr "Uzyj %c i %c klawiszy , aby podswietlic pozycje."
 #
 #. -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 ""
 "Nacisnij Enter, aby zaladowac wybrany system operacyjny, `e' aby wyedytowac"
@@ -979,7 +1009,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 "komendy przed zaladowaniem albo `c' , aby pracowac w linii polecen."
 
@@ -993,26 +1023,31 @@ msgstr "komendy przed zaladowaniem albo `c' , aby pracowac w linii polecen."
 #
 #. -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 "Podswietlony system zostanie uruchomiony po %d sekundach."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "nie ma ju� miejsca na /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 "Pulpit"
 
 #. -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 "Menu startowe"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Gdzie chcesz zainstalowa� program rozruchowy?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "brak pomocy.\n"
@@ -1025,520 +1060,698 @@ msgstr "Konfiguracja sposobu uruchamiania"
 msgid "/_File"
 msgstr "/_Plik"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Plik/_Nowy"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Plik/_Otw�rz"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Plik/Zapi_sz"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Plik/Z_apisz jako"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Plik/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Plik/Za_ko�cz"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>k"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Opcje"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Opcje/Test"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/Pomo_c"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Pomoc/O _programie"
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Konfiguruj"
-
-#: ../../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 ""
-"%s jest programem uruchamiaj�cym system (bootloaderem)\n"
-"Wybierz Konfiguruj, by uruchomi� kreatora.."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Tryb Lilo/Grub"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "Wygl�d nowoczesny z kategoriami"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "Styl nowoczesny"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "Wygl�d tradycyjny"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "Wygl�d tradycyjny Gtk+"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "Uaktywnij graficzny start"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Tryb Lilo/Grub"
+
+#: ../../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 ""
+"%s jest programem uruchamiaj�cym system (bootloaderem)\n"
+"Wybierz Konfiguruj, by uruchomi� kreatora.."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Konfiguruj"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Tryb uruchamiania"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Tryb pracy systemu"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "Uruchom X-Window po uruchomieniu"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Nie, nie chc� automatycznego logowania"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Tak, chc� dla tego u�ytkownika korzysta� z automatycznego logowania"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Tryb pracy systemu"
-
-#: ../../bootlook.pm_.c:228
-msgid "Default Runlevel"
-msgstr "Domy�lny tryb uruchamiania"
-
-#: ../../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 "Anuluj"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "nie mo�na otworzy� dla odczytu /etc/inittab: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "nie mo�na otworzy� do odczytu /etc/sysconfig/autologin: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "nie mo�na otworzy� dla odczytu /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 "Instalacja LILO nie powiod�a si�. Wyst�pi� nast�puj�cy b��d:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Utw�rz"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Odmontuj"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Usu�"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatuj"
+#: ../../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 "Zmie� rozmiar"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Typ"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minut"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Punkt montowania"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minuta"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Zapisz /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekund"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Prze��cz na tryb zaawansowany"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Prosz� zacz�� od archiwizacji danych"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Prze��cz na tryb standardowy"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Czytaj uwa�nie!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Przywr�� z pliku"
+#: ../../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 ""
+"Je�eli masz zamiar  u�ywa� aboot pami�taj, by zostawi�, \n"
+"wolne miejsce na pocz�tku dysku - wystarczy 2048 sektor�w."
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Zapisz do pliku"
+#: ../../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 "B��d"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Kreator"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Przywr�� z dyskietki"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Nowy"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Zapisz na dyskietk�"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Kolejka sieciowa"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Wyczy�� wszystko"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Punkt montowania"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Sformatuj wszystko"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Opcje"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Rozmie�� automatycznie"
+#: ../../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 "Typ"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "Wszystkie partycje podstawowe s� u�ywane"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Odmontuj"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Nie mo�na doda� wi�cej partycji"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Montuj"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Wybierz czynno��"
 
-#: ../../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 ""
-"By mie� wi�cej partycji, nale�y usun�� jedn�,\n"
-"by by�o mo�liwe utworzenie partycji rozszerzonej."
+"Na dysku jest jedna wielka partycja FAT.\n"
+"(zazwyczaj u�ywana przez Microsoft Dos/Windows)\n"
+"Nale�y zacz�� od pomniejszenia tej partycji\n"
+"(kliknij na partycji, po czym kliknij na \"Zmie� rozmiar\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Brak wolnego miejsca dla automatycznego rozmieszczenia"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Prosz� klikn�� na partycji"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Cofnij"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Prosz� klikn�� na partycji"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Zapisz tablic� partycji"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Prosz� klikn�� na partycji"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Wi�cej"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Szczeg�y"
 
-#: ../../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 "nieudane montowanie"
+
+#: ../../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 "Pusta"
 
-#: ../../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 "Inna"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Typy systemu plik�w:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Szczeg�y"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Utw�rz"
 
-#: ../../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 ""
-"Na dysku jest jedna wielka partycja FAT.\n"
-"(zazwyczaj u�ywana przez Microsoft Dos/Windows)\n"
-"Nale�y zacz�� od pomniejszenia tej partycji\n"
-"(kliknij na partycji, po czym kliknij na \"Zmie� rozmiar\")"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "U�yj zamiast tego ``%s'' "
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Prosz� zacz�� od archiwizacji danych"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Usu�"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "Czytaj uwa�nie!"
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Najpierw ``Odmontuj'' "
 
-#: ../../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 "Po zmianie typu partycji %s, wszystkie dane na niej zostan� utracone"
+
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Gdzie chcesz zamontowa� urz�dzenie %s?"
+
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Opcje modu�u:"
+
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"Je�eli masz zamiar  u�ywa� aboot pami�taj, by zostawi�, \n"
-"wolne miejsce na pocz�tku dysku - wystarczy 2048 sektor�w."
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Uwa�aj: ta operacja jest niebezpieczna"
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "Automatyczne montowanie wyjmowanych dysk�w"
 
-#: ../../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 "B��d"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Zmiana typu partycji"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Punkt montowania: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Jakiego systemu plik�w potrzebujesz?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Urz�dzenie: "
+#: ../../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 "Dosowy dysk: (przypuszczalnie %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 "Rodzaj: "
+#: ../../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 "Nazwa:"
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Serwer"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Pocz�tek: 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 "Rozmiar: %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�w"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Cylinder %d do cylindra %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Wybierz czynno��"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Sformatowana\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Utw�rz now� partycj�"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Nie sformatowana\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Zamontowano\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Prze��cz na tryb zaawansowany"
 
-#: ../../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 "Prze��cz na tryb standardowy"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Plikopartycje:%s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Cofnij"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Domy�lna partycja startowa\n"
-"    (dla startu MS-DOS, nie dla lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Kontynuowa� mimo to?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Poziom %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Wyj�cie bez zapisywania"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Rozmiar kawa�ka %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Opu�ci� program bez zapisywania tablicy partycji?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "Dyski RAID %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Chcesz przetestowa� t� konfiguracj�?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Nazwa plikopartycji: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Rozmie�� automatycznie"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Wyczy�� wszystko"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Wi�cej"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Wykrywanie dysk�w"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Brak wolnego miejsca dla automatycznego rozmieszczenia"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Wszystkie partycje podstawowe s� u�ywane"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Nie mo�na doda� wi�cej partycji"
+
+#: ../../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"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"By mie� wi�cej partycji, nale�y usun�� jedn�,\n"
+"by by�o mo�liwe utworzenie partycji rozszerzonej."
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Zapisz tablic� partycji"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Odzyskaj tablic� partycji"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Odzyskaj tablic� partycji"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Odzyskaj tablic� partycji"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Automatyczne montowanie wyjmowanych dysk�w"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Wybierz plik"
+
+#: ../../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"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"Zapasowa tablica partycji ma inny rozmiar\n"
+"Kontynuowa�?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Prosz� klikn�� na partycji"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Ostrze�enie"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Rozmiar: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"W�� dyskietk� do stacji.\n"
+"Wszystkie dane na niej zostan� utracone"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometria: %s cylindr�w, %s g�owic, %s sektor�w\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Pr�ba odzyskania tablicy partycji"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "Dyski LVM %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Obejrze� informacje"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Typ tabeli partycji: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Zmie� rozmiar"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "na szynie %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Przesu�"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Montuj"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatuj"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Uaktywnij"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Dodaj do RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Usu� z RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Modyfikuj RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Dodaj do LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Usu� z RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Usu� z LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Modyfikuj RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "U�yj na plikopartycj�"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Wybierz czynno��"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Utw�rz now� partycj�"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Sektor startowy: "
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Rozmiar w MB: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Typ systemu plik�w: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Punkt montowania: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Preferencja:"
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Formatowanie plikopartycji %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Zmiana typu partycji"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr "Prze��czenie z ext2 do ext3"
+
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "Gdzie chcesz zamontowa� plikopartycje %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 ""
+"Nie mo�na odmontowa� tej partycji, gdy� jest u�ywana przez plikopartycj�.\n"
+"Zacznij od usuni�cia plikopartycji."
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Obliczanie granic systemu plik�w FAT"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Zmiana rozmiaru"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Tej partycji nie mo�na zmniejszy�"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Wszystkie dane na tej partycji powinny zosta� zarchiwizowane"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"Po zmianie rozmiaru partycji %s, wszystkie dane na niej zostan� utracone"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Okre�l nowy rozmiar"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Rozmiar w MB: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Na kt�ry dysk chcesz przenie�� ?"
+
+#: ../../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 kt�ry sektor chcesz przenie�� ?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Przenoszenie"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Przenoszenie partycji..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Wybierz istniej�cy RAID aby doda� do niego"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "nowy"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Wybierz istniej�cy LVM aby doda� do niego"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "Nazwa LVM?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Na tej partycji nie mo�na za�o�y� plikopartycji"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Plikopartycja"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Nazwa plikopartycji: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Nazwisko"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "Plik jest ju� u�ywany jako plikopartycja, wybierz inny"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Plik ju� istnieje. U�y� go?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "urz�dzenie"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "poziom"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "rozmiar kawa�ka"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Uwa�aj: ta operacja jest niebezpieczna"
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Okre�l spos�b partycjonowania."
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1550,7 +1763,7 @@ msgstr ""
 "Albo u�yjesz LILO, (nie b�dzie dzia�a�), lub nie b�dziesz u�ywa� lilo\n"
 "i nie potrzebujesz /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"
@@ -1561,7 +1774,7 @@ msgstr ""
 "partycji /boot. Je�eli wi�c chcesz u�ywa� programu rozruchowego lilo\n"
 "dodaj partycj� /boot poni�ej cylindra 1024"
 
-#: ../../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"
@@ -1571,279 +1784,240 @@ msgstr ""
 "�aden program rozruchowy nie jest w stanie obs�u�y� jej bez partycji /boot.\n"
 "Pami�taj wi�c o dodaniu partycji /boot."
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "U�yj zamiast tego ``%s'' "
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Najpierw ``Odmontuj'' "
-
-#: ../../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 "Po zmianie typu partycji %s, wszystkie dane na niej zostan� utracone"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Kontynuowa� mimo to?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Wyj�cie bez zapisywania"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Opu�ci� program bez zapisywania tablicy partycji?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Zmiana typu partycji"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Jakiego systemu plik�w potrzebujesz?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Nie mo�na u�ywa� ReiserFS na partycji mniejszej ni� 32MB"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Gdzie chcesz zamontowa� plikopartycje %s?"
-
-#: ../../diskdrake.pm_.c:538
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Gdzie chcesz zamontowa� urz�dzenie %s?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Tablica partycji nap�du %s b�dzie zapisana na dysk!"
 
-#: ../../diskdrake.pm_.c:542
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
-msgstr ""
-"Nie mo�na odmontowa� tej partycji, gdy� jest u�ywana przez plikopartycj�.\n"
-"Zacznij od usuni�cia plikopartycji."
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Nale�y zrestartowa� komputer przed uaktywnieniem zmian"
 
-#: ../../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 "Po sformatowaniu wszystkie dane na partycji %s, zostan� utracone"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Formatowanie"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatowanie plikopartycji %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 "Formatowanie partycji %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Po sformatowaniu wszystkich partycji,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "wszystkie dane znajduj�ce si� na nich zostan� utracone"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Przesu�"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Na kt�ry dysk chcesz przenie�� ?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sektor"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid pad�"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Na kt�ry sektor chcesz przenie�� ?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Brak wolnego miejsca do stworzenia nowych partycji"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Przenoszenie"
+#: ../../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 "Przenoszenie partycji..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Brak wolnego miejsca do stworzenia nowych partycji"
 
-#: ../../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 "Tablica partycji nap�du %s b�dzie zapisana na dysk!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Nale�y zrestartowa� komputer przed uaktywnieniem zmian"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Rozdzielczo��: %s\n"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Obliczanie granic systemu plik�w FAT"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Urz�dzenie: "
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Zmiana rozmiaru"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "Dosowy dysk: (przypuszczalnie %s)\n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Tej partycji nie mo�na zmniejszy�"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Rodzaj: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Wszystkie dane na tej partycji powinny zosta� zarchiwizowane"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Nazwa:"
 
-#: ../../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 ""
-"Po zmianie rozmiaru partycji %s, wszystkie dane na niej zostan� utracone"
+msgid "Start: sector %s\n"
+msgstr "Pocz�tek: sektor  %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Okre�l nowy rozmiar"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Rozmiar: %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 sektor�w"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Utw�rz now� partycj�"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Cylinder %d do cylindra %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Sektor startowy: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Sformatowana\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Rozmiar w MB: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Nie sformatowana\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Typ systemu plik�w: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Zamontowano\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Preferencja:"
+#: ../../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 "Na tej partycji nie mo�na za�o�y� plikopartycji"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Plikopartycje:%s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Plikopartycja"
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"Domy�lna partycja startowa\n"
+"    (dla startu MS-DOS, nie dla lilo)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Nazwa plikopartycji: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Poziom %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "Plik jest ju� u�ywany jako plikopartycja, wybierz inny"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Rozmiar kawa�ka %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Plik ju� istnieje. U�y� go?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "Dyski RAID %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Wybierz plik"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Nazwa plikopartycji: %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 ""
-"Zapasowa tablica partycji ma inny rozmiar\n"
-"Kontynuowa�?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Ostrze�enie"
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\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 ""
-"W�� dyskietk� do stacji.\n"
-"Wszystkie dane na niej zostan� utracone"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Pr�ba odzyskania tablicy partycji"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "urz�dzenie"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "poziom"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "rozmiar kawa�ka"
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Wybierz istniej�cy RAID aby doda� do niego"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Rozmiar: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "nowy"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometria: %s cylindr�w, %s g�owic, %s sektor�w\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Wybierz istniej�cy LVM aby doda� do niego"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Informacje: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "Nazwa LVM?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "Dyski LVM %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Automatyczne montowanie wyjmowanych dysk�w"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Typ tabeli partycji: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Odzyskaj tablic� partycji"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "na szynie %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Prze�aduj"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Opcje: %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 formatowania z %s nieudane"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Nie wiadomo jak sformatowa� %s typu %s"
 
-#: ../../fs.pm_.c:230
-msgid "mount failed: "
+#: ../../fs.pm_.c:568
+msgid "mount failed"
 msgstr "nieudane montowanie"
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr "fsck zwr�ci�o kod b��du %d lub sygna� %d"
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
+msgid "mount failed: "
+msgstr "nieudane montowanie: "
+
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "b��d odmontowania %s; %s"
@@ -1856,41 +2030,44 @@ msgstr "proste"
 msgid "server"
 msgstr "serwer"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Nie mo�na u�ywa� JFS na partycji mniejszej ni� 16MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Nie mo�na u�ywa� ReiserFS na partycji mniejszej ni� 32MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Punkty montowania musz� zaczyna� si� od /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Istnieje partycja z punktem montowania %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Zap�tlone montowanie %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 "Nie mo�n u�y� LVM dla punktu montowania %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Ten katalog powinien by� wewn�trz systemu plik�w / (root)"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Dla tego punktu montowania potrzebujesz porz�dnego systemu plik�w (ext2,"
 "reiserfs)\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "B��d otwarcia %s do zapisu: %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"
@@ -1898,323 +2075,404 @@ msgstr ""
 "Wyst�pi� b��d - nie znaleziono urz�dze�, na kt�rych mo�na utworzy� nowe \n"
 "systemy plik�w. Sprawd� sprz�t, by wykry� przyczyn�"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Nie masz �adnych partycji!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "Wybierz w�a�ciwy j�zyk instalacji i u�ywania systemu."
-
-#: ../../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
+#, fuzzy
+msgid ""
+"Listed above are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, they are good for most common\n"
+"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"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
+" * \"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 ""
-"By kontynuowa� instalacj�, musisz zaakceptowa� warunki licencji.\n"
+"Powy�ej pokazano wykryte na Twoim dysku istniej�ce partycje linuksowe\n"
+"Mo�esz zastosowa� wyb�r okre�lony przez kreatora, s� one odpowiednie\n"
+"w wi�kszo�ci przypadk�w. Jesli chcesz zmieni� , musisz okre�li� co najmniej\n"
+"partycj� root (\"/\"). Nie wybieraj zbyt ma�ej partycji - nie b�dziesz m�g� "
+"w�wczas\n"
+"zainstalowa� zbyt du�o oprogramowania. Je�li chcesz trzyma� swoje dane na \n"
+"oddzielnej partycji, mo�esz tak�e wybra� \"/home\" (jest to mo�liwe tylko, "
+"je�li\n"
+"masz wi�cej ni� jedn� partycj� linuksow�\n"
 "\n"
 "\n"
-"Wybierz \"Zgadzam si�\", je�li zgadzasz si� z jej warunkami.\n"
+"Dla informacji, ka�da partycja jest okre�lona przez \"Nazw�\" i \"Rozmiar"
+"\".\n"
 "\n"
 "\n"
-"Wybierz \"Nie zgadzam si�\", je�li si� z nimi nie zgadzasz.\n"
-"Instalacja zostanie zako�czona bez �adnych zmian w konfiguracji."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Wybierz odpowiedni j�zyk i uk�ad klawiatury z listy powy�ej"
-
-#: ../../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 ""
-"Je�li chcesz, by po instalacji by�y dost�pne tak�e inne j�zyki\n"
-"(poza wybranym na pocz�tku instalacji), wybierz je z listy powy�ej\n"
-"Je�li chcesz wybra� wszystkie, wska� \"Wszystkie\"."
-
-#: ../../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"
+"Nazwa jest okre�lana nast�puj�co: \"typ dysku\",\"numer dysku\",\n"
+"\"numer partycji\". (na przyk�ad \"hda1\").\n"
 "\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
+"\"Typ dysku\" to \"hd\" w przypadku dysk�w IDE, \"sd\" w przypadku SCSI\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"
+"\"Numer dysku\" to litera po \"hd\" lub \"sd\". W przypadku dysku IDE:\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\" oznacza pierwszy dysk na pierwszym kontrolerze IDE\n"
+"\n"
+"   * \"b\" oznacza drugi dysk na pierwszym kontrolerze IDE\n"
 "\n"
+"   * \"c\" oznacza pierwszy dysk na drugim kontrolerze IDE\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"
+"   * \"d\" oznacza drugi dysk na drugim kontrolerze IDE\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."
+"W przyadku dysk�w SCSI \"a\" oznacza pierwszy dysk twardy,\n"
+"\"b\" - drugi dysk twardy, itd."
+
+#: ../../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 ""
-"Wybierz \"Instalacja\" je�li nie masz zainstalowanej starszej wersji\n"
-"Linux-Mandrake, lub je�li chcesz u�ywa� wielu dystrybucji lub wersji.\n"
+
+#: ../../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"
-"Wybierz \"Aktualizacja\" je�li chcesz zaktualizowa� ju� zainstalowan� wersj� "
-"Mandrake Linux:\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"
-"W zale�no�ci od poziomu Twojej znajomo�ci GNU/Linuksa mo�esz wybra� jeden z "
-"nast�puj�cych sposob�w  instalacji\n"
-" lub aktualizacji systemu operacyjnego Linux-Mandrake.\n"
+" * \"Development\": if the machine is to be used for programming, choose "
+"the\n"
+"desired group(s).\n"
 "\n"
-"\t* Zalecany: Je�li nie instalowa�e� GNU/Linuksa nigdy wcze�niej, wybierz "
-"ten spos�b instalacji,\n"
-"\t  jest bardzo prosty, odpowiesz na kilka prostych pyta�\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* U�ytkownika: Je�li jeste� obeznany z GNU/Linux, mo�esz okre�li� "
-"podstawowe zastosowanie komputera. (stacja robocza, serwer\n"
-"\t  programowanie). Odpowiesz tak�e na wi�cej pyta�, ni� przy sposobie "
-"instalacji \"Zalecany\".\n"
-"\t  tak wi�c powiniene� troch� zna� GNU/Linuksa, by wybra� ten "
-"rodzajinstalacji\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* Ekspert: Je�li dobrze znasz  GNU/Linuksa, wybierz ten spos�b instalacji "
-"Podobnie jak w instalacji \"U�ytkownika\", b�dziesz m�g� okre�li� podstawowe "
-"zastosowanie komputera. Przemy�l,\n"
-" czy na pewno chcesz wybra� ten rodzaj instalacji. B�dziesz m�g� "
-"przeprowadzi� bardzo zindywidualizowan� instalacj�, lecz\n"
-"\t  odpowied� na niekt�re pytania mo�e by� bardzo trudna bez dobrej "
-"znajomo�ci GNU/Linuksa.\n"
-"\t  Nie wybieraj wi�c tego rodzaju instalacji, je�li nie jeste� pewien."
+"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"
+"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"
-"  - 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"
+"!! 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"
-"  - 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 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 ""
-"Wybierz:\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"
-"  - U�ytkownika: Je�li jeste� obeznany z Linuxem, masz mo�liwo��\n"
-"     okre�lenia zastosowania zainstalowanego systemu. Szczeg�y poni�ej\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"
-"  - Ekspert: �wietnie znasz  GNU/Linux i chcesz zainstalowa� go\n"
-"    w nietypowy, odpowiedni dla Ciebie spos�b . Podobnie jak w przypadku\n"
-"    instalacji \"U�ytkownika\" masz mo�liwo�� okre�lenia zastosowania "
-"systemu\n"
-"    Ale bardzo, bardzo prosimy, NIE WYBIERAJ TEJ OPCJI, JE�LI NIE WIESZ CO "
-"ROBISZ!"
+"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:68
+#: ../../help.pm_.c:172
+#, fuzzy
 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"
-"\n"
+"You may now choose which services you wish to start at boot time.\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 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"
+"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"
-"\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."
+"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 ""
-"Teraz nale�y okre�li� spos�b wykorzystania komputera. \n"
-"\t* Stacja robocza: To dokona�y wyb�r, je�li u�ywasz komputera do codziennej "
-"pracy w biurze lub\n"
-"\t  w domu.\n"
+"Teraz mo�esz wybra� us�ugi, jakie chcesz mie� w��czone przy starcie\n"
+"systemu.\n"
 "\n"
 "\n"
-"\t* Programowanie: wybierz t� opcj�, je�eli chcesz korzysta� z komputera do "
-"tworzenia oprogramowania.\n"
-"\t  Zostanie zainstalowane ca�e oprogramowanie umo�liwiaj�ce kompilacj� , "
-"debugowanie program�w,\n"
-"\t  oraz tworzenie pakiet�w oprogramowania.\n"
+"Je�eli najedziesz mysz� na element listy, to pojawi si� ma�y ob�oczek\n"
+"z opisem tej us�ugi.\n"
 "\n"
 "\n"
-"\t* Serwer: jest to w�a�ciwy wyb�r, je�li komputer ma byc serwerem. Mo�e to "
-"by� serwer plik�w (NFS lub\n"
-"\t  SMB ), serwer drukarek (uniksowy typu \"windowsowego\") serwer NIS, "
-"serwer baz danych itp.\n"
-"\t  Nie oczekuj zainstalowaniea �adnych wodotrysk�w typu KDE lub GNOME."
+"Zachowaj szczeg�ln� ostro�no�� przy wyborze, je�eli chcesz u�ywa�\n"
+"swojej maszyny jako serwera - niekt�rych us�ug nie b�dziesz chcia�\n"
+"uruchamia�. Pami�taj, �e uruchomienie niekt�rych us�ug na serwerze\n"
+"mo�e by� niebezpieczne.\n"
+"W og�lno�ci, uruchamiaj tylko te us�ugi, kt�rych naprawd� potrzebujesz."
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:188
 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"
-"\n"
+"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 korzysta z czasu GMT \"Czas uniwersalny Greenwich\", t�umacz�c go\n"
+"na czas lokalny odpowiednio do wybranej strefy czasowej."
+
+#: ../../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 ""
-"DrakX spr�buje wykry� kontroler(y) SCSI na magistrali PCI.\n"
-"Je�li je odnajdzie i rozpozna, kt�re sterowniki nale�y u�y�\n"
-"za�aduje je automatycznie.\n"
+
+#: ../../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"
-"Je�li posiadasz kontroler  SCSI ISA, lub PCI, ale DrakX nie\n"
-"wykryje sterownika do niego, zostaniesz zapytany, czy w Twoim\n"
-"systemie istnieje kontroler SCSI. Je�li nie masz �adnego, odpowiedz\n"
-"\"Nie\", je�li masz jeden lub wi�cej, odpowiedz \"Tak\". Uka�e si�\n"
-"w�wczas lista sterownik�w, z kt�rej nale�y wybra� w�a�ciwy.\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"
+" * 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"
-"Po wybraniu sterownika, DrakX spyta Ci�, czy chcesz okre�li�\n"
-"opcje dla niego. Pozw�l sterownikowi automatycznie wykry� \n"
-"ustawienia, zazwyczaj dzia�a to dobrze\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"
-"Je�li nie, podaj sterownikowi opcje znalezione w dokumentacji,\n"
-"na stronie producenta sprz�tu (je�li masz dost�p do Internetu)\n"
-"lub takie, jak w Windows (je�li je posiadasz). Podr�cznik instalacji\n"
-"pomo�e Ci odnale�� potrzebne parametry."
+"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:108
+#: ../../help.pm_.c:255
+#, fuzzy
 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"
+"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 "
-"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"
+"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 ""
 "W tym etapie instalacji okre�lasz, gdzie na dysku zostanie zainstalowany\n"
-"Linux-Mandrake. Je�li dysk jest pusty lub istniej�ce systemy operacyjne\n"
+"Mandrake Linux. Je�li dysk jest pusty lub istniej�ce systemy operacyjne\n"
 "zajmuj� ca�e dost�pne miejsce, nale�y podzieli� dysk na partycje\n"
 "Partycjonowanie to po prostu logiczny podzia� twardego dysku na oddzielne\n"
-"obszary w celu zainstalowania systemu Linux-Mandrake\n"
+"obszary w celu zainstalowania systemu Mandrake Linux\n"
 "\n"
 "\n"
 "Poniewa� efekt partycjonowania jest nieodwracalny, czynno�� wydaje si�\n"
@@ -2237,127 +2495,229 @@ msgstr ""
 "By to zrobi�, u�yj powy�szego kreatora. Mo�liwych jest kilka rozwi�za�\n"
 "zale�nych od konfiguracji dysku twardego:\n"
 "\n"
-"\t* U�ycie istniej�cych partycji: gdy kreator wykryje jedn� lub wi�cej "
+"* U�ycie istniej�cych partycji: gdy kreator wykryje jedn� lub wi�cej "
 "istniej�cych partycji linuksowych,\n"
-"\t   wybierz to rozwi�zanie, je�li chcesz u�y� te partycje na now� "
+"   wybierz to rozwi�zanie, je�li chcesz u�y� te partycje na now� "
 "instalacj�.\n"
 "\n"
 "\n"
-"\t* Skasowanie zawarto�ci ca�ego dysku: Je�li chcesz skasowa� ze swojego\n"
+"* Skasowanie zawarto�ci ca�ego dysku: Je�li chcesz skasowa� ze swojego\n"
 "dysku wszystkie dane i wszystkie partycje\n"
-"\t  i zast�pi� nowym systemem Linux-Mandrake, wybierz to rozwi�zanie. "
-"Pami�taj,w tym przypadku nie\n"
-"\t  nie ma mo�liwo�ci odwrotu po potwierdzeniu wyboru.\n"
+"  i zast�pi� nowym systemem Mandrake Linux, wybierz to rozwi�zanie. Pami�taj,"
+"w tym przypadku nie\n"
+"  nie ma mo�liwo�ci odwrotu po potwierdzeniu wyboru.\n"
 "\n"
 "\n"
-"\t*  U�yj wolnego miejsca na partycji Windows: Je�li na dysku jest "
+"*  U�yj wolnego miejsca na partycji Windows: Je�li na dysku jest "
 "zainstalowany\n"
 "Microsoft Windows i zajmuje \n"
-"\t  ca�e dost�pne miejsce,mo�liwe jest utworzenie wolnego miejsca dla "
-"Linuksa. By to zrobi�, mo�na skasowa� \n"
-"\t  partycj� Windows wraz z danymi (patrz \"Wyma� ca�y dysk\" lub \"Tryb "
+"  ca�e dost�pne miejsce,mo�liwe jest utworzenie wolnego miejsca dla Linuksa. "
+"By to zrobi�, mo�na skasowa� \n"
+"  partycj� Windows wraz z danymi (patrz \"Wyma� ca�y dysk\" lub \"Tryb "
 "eksperta\") lub zmieni�\n"
-"\t  rozmiar partycji Windows. Zmiana rozmiaru jest realizowana bez\n"
+"  rozmiar partycji Windows. Zmiana rozmiaru jest realizowana bez\n"
 "utraty �adnych danych. \n"
-"\t  To rozwi�zanie jest zalecane, je�li chcesz u�ywa� zar�wno Linuksa-"
+"  To rozwi�zanie jest zalecane, je�li chcesz u�ywa� zar�wno Linuksa-"
 "Mandrake, jak i Windows\n"
 "\n"
 "\n"
-"\t  Nale�y pami�ta�, �e w ten spos�b partycja Windows b�dzie mniejsza ni� do "
+"  Nale�y pami�ta�, �e w ten spos�b partycja Windows b�dzie mniejsza ni� do "
 "tej pory. Oznacza to\n"
-"\t mniej wolnego miejsca na dane oraz instalacj� nowych program�w\n"
+" mniej wolnego miejsca na dane oraz instalacj� nowych program�w\n"
 "\n"
 "\n"
-"\t* Tryb eksperta: wybierz t� opcj�, je�li chcesz partycjonowa� sw�j dysk "
+"* Tryb eksperta: wybierz t� opcj�, je�li chcesz partycjonowa� sw�j dysk "
 "r�cznie.Pami�taj!\n"
-"\t  Wybranie tej opcji daje Ci du�e mo�liwo�ci, lecz jest bardzo "
-"niebezpieczne.Bardzo �atwo mo�na utraci� wszystkie dane\n"
-"\t  Nie wybieraj wi�c tej opcji, je�li naprawd� nie wiesz, co robisz!"
+"  Wybranie tej opcji daje Ci du�e mo�liwo�ci, lecz jest bardzo niebezpieczne."
+"Bardzo �atwo mo�na utraci� wszystkie dane\n"
+"  Nie wybieraj wi�c tej opcji, je�li naprawd� nie wiesz, co robisz!"
 
-#: ../../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"
+"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"
+"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 ""
+"Wszystkie nowo powsta�e partycje musz� zosta� sformatowane przed\n"
+"wykorzystaniem (formatowanie oznacza utworzenie systemu plik�w).\n"
+"\n"
+"\n"
+"Mo�na teraz tak�e powt�rnie sformatowa� istniej�ce ju� partycje, by\n"
+"usun�� znajduj�ce si� na nich dane. Je�li chcesz to zrobi�, zaznacz\n"
+"partycje do sformatowania\n"
+"\n"
+"\n"
+"Pami�taj, �e nie jest konieczne formatowanie wszystkich istniej�cych ju�\n"
+"partycji. Nale�y sformatowa� partycje zawieraj�ce system operacyjny:\n"
+"\"/\", \"/usr\" oraz \"/var\", nie jest natomiast konieczne formatowanie\n"
+"partycji zawieraj�cych dane, kt�re chcesz zachowa� (zazwyczaj /home).\n"
+"Uwa�nie wybieraj partycje do sformatowania, po sformatowaniu wszystkie\n"
+"dane zostan� utracone bez mo��iwo�ci ich odzyskania.\n"
 "\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
 "\n"
+"Wybierz \"OK\", je�li jeste� ju� gotowy do formatowania partycji.\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"
+"Wybierz \"Anuluj\", je�li chcesz wybra� do zainstalowania\n"
+"Linuksa-Mandrake inne partycje."
+
+#: ../../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 ""
+"Trwa instalacja systemu operacyjnego Mandrake Linux.\n"
+"Zabierze to troch� czasu (w zale�no�ci od ilo�ci  wybranych pakiet�w\n"
+"oraz szybko�ci komputera)\n"
 "\n"
 "\n"
-"   * Undo: you can use this option to cancel your changes.\n"
+"B�d� cierpliwy."
+
+#: ../../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 ""
 "W tym etapie instalacji wybierasz partycje, na kt�rych b�dzie instalowany\n"
-"Linux-Mandrake, je�li istniej�, np. pozosta�y po poprzedniej instalacji,\n"
+"Mandrake Linux, je�li istniej�, np. pozosta�y po poprzedniej instalacji,\n"
 "lub te� zosta�y za�o�one innym narz�dziem. W przeciwnym razie nale�y je\n"
 "utworzy�. Operacja ta polega na logicznym podziale dysku twardego komputera\n"
 "na na oddzielne obszary\n"
@@ -2427,159 +2787,41 @@ msgstr ""
 "\n"
 "           * Ctrl-m by okre�li� punkt montowania"
 
-#: ../../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"
-"\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\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\" 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 ""
-"Powy�ej pokazano wykryte na Twoim dysku istniej�ce partycje linuksowe\n"
-"Mo�esz zastosowa� wyb�r okre�lony przez kreatora, s� one odpowiednie\n"
-"w wi�kszo�ci przypadk�w. Jesli chcesz zmieni� , musisz okre�li� co najmniej\n"
-"partycj� root (\"/\"). Nie wybieraj zbyt ma�ej partycji - nie b�dziesz m�g� "
-"w�wczas\n"
-"zainstalowa� zbyt du�o oprogramowania. Je�li chcesz trzyma� swoje dane na \n"
-"oddzielnej partycji, mo�esz tak�e wybra� \"/home\" (jest to mo�liwe tylko, "
-"je�li\n"
-"masz wi�cej ni� jedn� partycj� linuksow�\n"
-"\n"
-"\n"
-"Dla informacji, ka�da partycja jest okre�lona przez \"Nazw�\" i \"Rozmiar"
-"\".\n"
-"\n"
-"\n"
-"Nazwa jest okre�lana nast�puj�co: \"typ dysku\",\"numer dysku\",\n"
-"\"numer partycji\". (na przyk�ad \"hda1\").\n"
-"\n"
-"\n"
-"\"Typ dysku\" to \"hd\" w przypadku dysk�w IDE, \"sd\" w przypadku SCSI\n"
-"\n"
-"\n"
-"\"Numer dysku\" to litera po \"hd\" lub \"sd\". W przypadku dysku IDE:\n"
-"\n"
-"   * \"a\" oznacza pierwszy dysk na pierwszym kontrolerze IDE\n"
-"\n"
-"   * \"b\" oznacza drugi dysk na pierwszym kontrolerze IDE\n"
-"\n"
-"   * \"c\" oznacza pierwszy dysk na drugim kontrolerze IDE\n"
-"\n"
-"   * \"d\" oznacza drugi dysk na drugim kontrolerze IDE\n"
-"\n"
-"\n"
-"W przyadku dysk�w SCSI \"a\" oznacza pierwszy dysk twardy,\n"
-"\"b\" - drugi dysk twardy, itd."
-
-#: ../../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 ""
-"Wybierz dysk, kt�ry chcesz wykasowa�, by za�o�y� na nim\n"
-"partycje Linux-Mandrake. Pami�taj, �e wszystkie dane z tego\n"
-"dysku zoastan� utracone bez mo�liwo�ci odzyskania."
-
-#: ../../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 ""
-"Wybierz \"OK\", je�li chcesz usun�� dane na wszystkich partycjach\n"
-"istniej�cych na dysku. Pami�taj, po wybraniu \"OK\", nie b�dzie\n"
-"mo�liwe odzyskanie �adnych danych z partycji (tak�e Windows)\n"
-"\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"Wybierz \"Anuluj\", by anulowa� t� operacj� bez utraty danych."
-
-#: ../../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"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc.\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 ""
 "Na dysku wykryto wi�cej ni� jedn� partycj� Windows. Wybierz, kt�r�\n"
-"z nich chcesz zmniejszy� w celu zainstalowania Linux-Mandrake\n"
+"z nich chcesz zmniejszy� w celu zainstalowania Mandrake Linux\n"
 "\n"
 "\n"
 "Dla informacji, ka�da partycja jest okre�lona przez\n"
@@ -2610,771 +2852,228 @@ msgstr ""
 "\"Nazwa Windows\" to litera dysku pod Windows (pierwszy dysk \n"
 "lub partycja to \"C:\")."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr "B�d� cierpliwy. Ta operacja mo�e potrwa� kilkana�cie 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"
-"\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"
+"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 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"
+"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 be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\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"
-"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 ""
-"Wszystkie nowo powsta�e partycje musz� zosta� sformatowane przed\n"
-"wykorzystaniem (formatowanie oznacza utworzenie systemu plik�w).\n"
+"Wybierz \"Instalacja\" je�li nie masz zainstalowanej starszej wersji\n"
+"Mandrake Linux, lub je�li chcesz u�ywa� wielu dystrybucji lub wersji.\n"
 "\n"
 "\n"
-"Mo�na teraz tak�e powt�rnie sformatowa� istniej�ce ju� partycje, by\n"
-"usun�� znajduj�ce si� na nich dane. Je�li chcesz to zrobi�, zaznacz\n"
-"partycje do sformatowania\n"
+"Wybierz \"Aktualizacja\" je�li chcesz zaktualizowa� ju� zainstalowan� wersj� "
+"Mandrake Linux:\n"
 "\n"
 "\n"
-"Pami�taj, �e nie jest konieczne formatowanie wszystkich istniej�cych ju�\n"
-"partycji. Nale�y sformatowa� partycje zawieraj�ce system operacyjny:\n"
-"\"/\", \"/usr\" oraz \"/var\", nie jest natomiast konieczne formatowanie\n"
-"partycji zawieraj�cych dane, kt�re chcesz zachowa� (zazwyczaj /home).\n"
-"Uwa�nie wybieraj partycje do sformatowania, po sformatowaniu wszystkie\n"
-"dane zostan� utracone bez mo��iwo�ci ich odzyskania.\n"
+"W zale�no�ci od poziomu Twojej znajomo�ci GNU/Linuksa mo�esz wybra� jeden z "
+"nast�puj�cych sposob�w  instalacji\n"
+" lub aktualizacji systemu operacyjnego Mandrake Linux.\n"
 "\n"
+"* Zalecany: Je�li nie instalowa�e� GNU/Linuksa nigdy wcze�niej, wybierz ten "
+"spos�b instalacji,\n"
+"  jest bardzo prosty, odpowiesz na kilka prostych pyta�\n"
 "\n"
-"Wybierz \"OK\", je�li jeste� ju� gotowy do formatowania partycji.\n"
 "\n"
+"* U�ytkownika: Je�li jeste� obeznany z GNU/Linux, mo�esz okre�li� podstawowe "
+"zastosowanie komputera. (stacja robocza, serwer\n"
+"  programowanie). Odpowiesz tak�e na wi�cej pyta�, ni� przy sposobie "
+"instalacji \"Zalecany\".\n"
+"  tak wi�c powiniene� troch� zna� GNU/Linuksa, by wybra� ten "
+"rodzajinstalacji\n"
 "\n"
-"Wybierz \"Anuluj\", je�li chcesz wybra� do zainstalowania\n"
-"Linuksa-Mandrake inne partycje."
+"\n"
+"* Ekspert: Je�li dobrze znasz  GNU/Linuksa, wybierz ten spos�b instalacji "
+"Podobnie jak w instalacji \"U�ytkownika\", b�dziesz m�g� okre�li� podstawowe "
+"zastosowanie komputera. Przemy�l,\n"
+" czy na pewno chcesz wybra� ten rodzaj instalacji. B�dziesz m�g� "
+"przeprowadzi� bardzo zindywidualizowan� instalacj�, lecz\n"
+"  odpowied� na niekt�re pytania mo�e by� bardzo trudna bez dobrej znajomo�ci "
+"GNU/Linuksa.\n"
+"  Nie wybieraj wi�c tego rodzaju instalacji, je�li nie jeste� pewien."
 
-#: ../../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 ""
-"Mo�esz teraz wybra� grupy pakiet�w, kt�re chcesz \n"
-"zainstalowa� lub aktualizowa�\n"
-"\n"
-"\n"
-"DrakX sprawdzi, czy masz na to do�� miejsca na dysku. Zostaniesz\n"
-"ostrze�ony, je�li jest go zbyt ma�o. Je�li postanowisz mimo to kontynuowa�,\n"
-"cz�� mniej wa�nych pakiet�w nie zostanie zainstalowana.\n"
-"Na dole listy znajdziesz opcj� \"Samodzielny wyb�r pakiet�w\"; \n"
-"B�dziesz musia� jednak wybiera� spo�r�d ponad1000 pakiet�w ..."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:534
 msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\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 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."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"Mo�na teraz indywidualnie wybiera� pakiety do zainstalowania.\n"
-"\n"
-"\n"
-"Klikni�cie w lewym rogu okna pakiet�w zwija lub rozwija list� pakiet�w\n"
-"\n"
-"\n"
-"Klikni�cie na \"Prze��cz mi�dzy p�askim i grupowym sortowaniem\"\n"
-"umo�liwia zobaczenie pakiet�w posortowanych alfabetycznie\n"
-"\n"
-"\n"
-"Je��i nie chcesz by� informowany o zale�no�ciach miedzy pakietami,\n"
-"kliknij na \"Automatyczne sprawdzanie zale�no�ci\". Po w��czeniu tej opcji\n"
-"odznaczenie pakietu spowoduje automatyczne od innych pakiet�w,\n"
-"kt�re wymagaj� go do dzia�ania."
 
-#: ../../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 ""
-"Je�li masz wszystkie instalacyjne p�yty CD z listy powy�ej, kliknij Ok.\n"
-"Je�li nie masz �adnej z tych p�yt, kliknij Anuluj.\n"
-"Je�li masz niekt�re z p�yt, odznacz te, kt�rych nie masz i kliknij 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 ""
-"Trwa instalacja systemu operacyjnego Linux-Mandrake.\n"
-"Zabierze to troch� czasu (w zale�no�ci od ilo�ci  wybranych pakiet�w\n"
-"oraz szybko�ci komputera)\n"
-"\n"
-"\n"
-"B�d� cierpliwy."
-
-#: ../../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 ""
-"Mo�na teraz przetestowa� mysz. U�yj przycisk�w i k�ka by sprawdzi�,\n"
-"czy ustawienia s� w�a�ciwe. Je�li nie, wybierz \"Anuluj\" by wybra� inny\n"
-"sterownik."
 
-#: ../../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 ""
 "Wybierz w�a�ciwy port. Na przyk�ad COM1 z MS Windows\n"
 "w GNU/Linux nazywa si� 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 ""
-"Wybierz w�a�ciw� opcj�, by pod��czy� komputer do Internetu\n"
-"lub sieci lokalnej. Pami�taj o w��czeniu urz�dze� zewn�trznych\n"
-"przed wybraniem opcji, by DrakX m�g� je automatycznie wykry�.\n"
-"\n"
-"\n"
-"Je�li nie u�ywasz sieci lokalnej ani Internetu, wybierz\n"
-"\"Wy��czenie sieci\".\n"
-"\n"
-"\n"
-"Je�li chcesz skonfigurowa� sie� po instalacji, lub zako�czy�e�\n"
-"konfigurowanie sieci, wybierz \"Zrobione\"."
-
-#: ../../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 ""
-"Nie wykryto modemu. Prosz� okre�li� port szeregowy, do kt�rego jest on "
-"pod��czony.\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"
-"Dla informacji: pierwszy port szeregowy (COM1 w Windows)\n"
-"w GNU/Linux nazywa si� \"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 ""
-"Nale�y teraz poda� opcje po��czenia modemowego. Je�li nie wiesz,\n"
-"lub nie wiesz co wpisa�, poprawne informacje otrzymasz od\n"
-"Twojego dostawcy Internetu (ISP). Je�li nie wpiszesz adres�w DNS, zostan� "
-"one pobrane od ISP\n"
-"w trakcie po��czenia."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Je�li posiadasz zewn�trzny modem, w��cz go, by DrakX m�g� go automatycznie "
-"wykry�."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "W��cz modem i wybierz w�asciwy model."
-
-#: ../../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 ""
-"Je�li nie jeste� pewien, �e powy�sze informacje s� prawid�owe, lub\n"
-"lub nie wiesz co wpisa�, poprawne informacje otrzymasz od\n"
-"Twojego dostawcy Internetu (ISP). Je�li nie wpiszesz adres�w DNS, zostan� "
-"one pobrane od ISP\n"
-"w trakcie po��czenia."
-
-#: ../../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 ""
-"Mo�esz teraz, poda� nazw� hosta (je�li trzeba).\n"
-"Je�li nie jeste� pewien, co wpisa�, nale�y uzyska� informacje od\n"
-"Twojego dostawcy Internetu (ISP)."
-
-#: ../../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 ""
-"Nale�y teraz skonfigurowa� kart� sieciow�\n"
-"\n"
-"   * adres IP, je�eli go nie znasz, spytaj administratora sieci\n"
-"     Nie wpisuj adresu IP, je�li wybra�e� \"Automatyczne IP\".\n"
-"\n"
-"   * mask� sieci, \"255.255.255.0\" na og� dzia�a. \n"
-"      Je�eli  nie jeste� pewien, spytaj administratora sieci.\n"
-"\n"
-"    * Automatyczne IP: Je�eli Twoja sie� u�ywa protoko�u DHCP lub BOOTP,\n"
-"      wybierz t� opcj�. Je�eli nie jeste� pewien, spytaj administratora "
-"sieci.\n"
-"      W przypadku wybranie tej opcji nie nale�y wpisywa� adresu IP"
-
-#: ../../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 ""
-"Mo�esz teraz, poda� nazw� hosta (je�li trzeba).\n"
-"Je�li nie jeste� pewien, co wpisa�, nale�y uzyska� informacje od "
-"administratora sieci."
-
-#: ../../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 ""
-"Mo�esz teraz, poda� nazw� hosta (je�li trzeba).\n"
-"Je�li nie jeste� pewien, co wpisa�, pozostaw to pole puste."
-
-#: ../../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 ""
-"Mo�esz teraz poda� opcje po��czenia modemowego. Je�eli ich nie znasz, \n"
-"skontaktuj si� z dostawc� Internetu (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 ""
-"Je�li b�dziesz korzysta� z serwer�w po�rednicz�cych, skonfiguruj je teraz.\n"
-"Je�eli nie jeste� pewien, spytaj administratora sieci lub dostawcy Internetu."
-
-#: ../../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 ""
-"Mo�esz u�y� pakiet�w kryptograficznych, je�eli Twoje po��czenie \n"
-"z Internetem zosta�o odpowiednio skonfigurowane. Zacznij od wyboru mirrora\n"
-"(miejsca, sk�d b�dziesz �ci�ga� pakiety) i wybierz pakiety do instalacji\n"
-"\n"
-"\n"
-"Pami�taj, �e wyb�r mirrora i pakiet�w musi by� zgodny z polskim prawem."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Nale�y teraz okre�li� stref� czasow� miejsca, w kt�rym mieszkasz."
-
-#: ../../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 korzysta z czasu GMT \"Czas uniwersalny Greenwich\", t�umacz�c go\n"
-"na czas lokalny odpowiednio do wybranej strefy czasowej.\n"
-"\n"
-"Je�li na swoim komputerze u�ywasz te� Windows, wybierz \"Nie\"."
-
-#: ../../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 ""
-"Teraz mo�esz wybra� us�ugi, jakie chcesz mie� w��czone przy starcie\n"
-"systemu.\n"
-"\n"
-"\n"
-"Je�eli najedziesz mysz� na element listy, to pojawi si� ma�y ob�oczek\n"
-"z opisem tej us�ugi.\n"
-"\n"
-"\n"
-"Zachowaj szczeg�ln� ostro�no�� przy wyborze, je�eli chcesz u�ywa�\n"
-"swojej maszyny jako serwera - niekt�rych us�ug nie b�dziesz chcia�\n"
-"uruchamia�. Pami�taj, �e uruchomienie niekt�rych us�ug na serwerze\n"
-"mo�e by� niebezpieczne.\n"
-"W og�lno�ci, uruchamiaj tylko te us�ugi, kt�rych naprawd� potrzebujesz."
-
-#: ../../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 ""
-"Mo�esz skonfigurowa� drukark� lokaln� (pod��czon� bezpo�rednio do\n"
-"Twojego komputera), lub sieciow� (dost�pn� poprzez sie� Unix, Netware\n"
-"lub 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 ""
-"Je�li chcesz mie� mo�liwo�� drukowania, wybierz system wydruku\n"
-"(dost�pne s� CUPS i LPR)\n"
-"\n"
-"\n"
-"CUPS to nowy, silny i elastyczny system wydruku dla system�w Unixowych\n"
-"(CUPS oznacza \"Common Unix Printing System\"). Jest to domy�lny system\n"
-"wydruku w Linux-Mandrake.\n"
-"\n"
-"\n"
-"LPR to stary system wydruku u�ywany w poprzednich\n"
-"wersjach Linux-Mandrake.\n"
-"\n"
-"\n"
-"Je�li nie u�ywasz drukarki, wybierz \"Brak\"."
-
-#: ../../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 obs�uguje wiele rodzaj�w drukarek. Ka�da z nich wymaga\n"
-"oddzielnej konfiguracji.\n"
-"\n"
-"\n"
-"Je�li drukarka jest fizycznie pod��czona do Twojego komputera, wybierz\n"
-"\"Drukarka lokalna\".\n"
-"\n"
-"\n"
-"Je�li chcesz uzyska� dost�p do drukarki na innym komputerze z Unixem,\n"
-"wybierz \"Drukarka sieciowa\".\n"
-"\n"
-"\n"
-"Je�li chcesz uzyska� dost�p do drukarki za�o�onej na innym komputerze\n"
-"z Microsoft Windows (lub Unixie z Samb�), wybierz \"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 ""
-"Nale�y teraz w��czy� drukark�, by umo�liwi� instalatorowi jej wykrycie.\n"
-"\n"
-"Konieczne jest te� podanie kilku informacji.\n"
-"\n"
-"\n"
-"...*.Nazwa drukarki: system wydruku wykorzystuje  \"lp\" jako domy�ln� "
-"drukark�, powiniene� posiada� drukark�\n"
-"     o takiej nazwie. Jedna drukarka mo�e mie� wiele nazw, oddzielonych "
-"znakiem '\"'\".\n"
-"     Je�li wi�c lubisz przyjazne nazwy, mo�esz z nich korzysta�:np. \"Moja "
-"drukarka|lp\".\n"
-"    Drukarka, kt�rej jedn� z nazw jest \"lp\" b�dzie drukark� domy�ln�\n"
-"\n"
-"\n"
-"   * Opis drukarki jest opcjonalny, lecz u�yteczny je�li posiadasz wi�cej "
-"drukarek, lub te� udost�pniasz je innym\n"
-"\n"
 "\n"
-"   * Lokalizacja. Je�li chcesz poda� informacje o po�o�eniu drukarki,\n"
-"     wpisz je tutaj (mo�esz wpisa� cokolwiek, np. \"Drugie pi�tro\").\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 ""
-"Nale�y wpisa� tutaj kilka informacji.\n"
-"\n"
-"\n"
-"   * Nazwa kolejki: system wydruku wykorzystuje  \"lp\" jako domy�ln� "
-"drukark�, powiniene� posiada� drukark�\n"
-"     o takiej nazwie. Jedna drukarka mo�e mie� wiele nazw, oddzielonych "
-"znakiem '\"'\".\n"
-"     Je�li wi�c lubisz przyjazne nazwy, mo�esz z nich korzysta�:np. \"Moja "
-"drukarka|lp\".\n"
-"    Drukarka, kt�rej jedn� z nazw jest \"lp\" b�dzie drukarka domy�ln�\n"
-"\n"
-"  \n"
-"   * Katalog bufora: jest to katalog, gdzie s� zapisywane drukowane zadania. "
-"Nie zmieniaj domy�lnego wpisu,\n"
-"     je�li nie wiesz, co wpisa�\n"
-"\n"
-"\n"
-"   * Pod��czenie drukarki. Je�li drukarka jest fizycznie pod��czona do "
-"Twojego komputera, wybierz\n"
-"     \"Drukarka lokalna\".\n"
-"\n"
-"\n"
-"     Je�li chcesz uzyska� dost�p do drukarki na innym komputerze z Unixem,\n"
-"     wybierz \"Drukarka sieciowa lpd\".\n"
-"\n"
-"\n"
-"     Je�li chcesz uzyska� dost�p do drukarki za�o�onej na innym komputerze z "
-"Microsoft Windows\n"
-"      (lub Unixie z Samb�), wybierz \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"     Je�li chcesz uzyska� dost�p do drukarki w sieci Netware, wybierz "
-"\"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 ""
-"Nie wykryto drukarki. Podaj nazw� portu, do kt�rego jest pod��czona\n"
-"\n"
-"\n"
-"Dla informacji: wi�kszo�� drukarek pod��cza si� do pierwszego portu "
-"r�wnoleg�ego\n"
-"Nazywa si� on w GNU/Linuksie \"/dev/lp0\", natomiast w Windows\"LPT1\""
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Wybierz drukark� z listy powy�ej."
-
-#: ../../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 ""
-"Wybierz w�a�ciwe dla swojej drukarki opcje.\n"
-"Je�li nie wiesz, co zaznaczy�, zapoznaj si� z dokumentacj� drukarki\n"
-"\n"
-"\n"
-"W nast�pnym kroku b�dzie mo�liwe sprawdzenie wybranej konfiguracji oraz jej "
-"modyfikacja, je�li wydruki nie b�d� zgodne z oczekiwaniami."
 
-#: ../../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 ""
-"Teraz nale�y wpisa� has�o roota Twojego Linux-Mandrake.\n"
-"Has�o nale�y wpisa� dwa razy w celu weryfikacji poprawno�ci\n"
-"\n"
-"\n"
-"Root to administrator systemu, jedyny u�ytkownik maj�cy prawo\n"
-"modyfikacji konfiguracji systemu.Zwr�� wi�c szczeg�ln� uwag� na\n"
-"jego has�o! Nieautoryzowane u�ycie konta roota mo�e by� skrajnie\n"
-"niebezpieczne dla integralno�ci systemu i danych oraz innych system�w,\n"
-"pod��czonych do niego.\n"
-"\n"
-"\n"
-"Has�o powinno by� mieszank� znak�w alfanumerycznych\n"
-"o d�ugo�ci co najmniej 8 znak�w. *Nigdy* nie powinno by�\n"
-"zapisywane.\n"
-"\n"
-"Nie wymy�laj jednak has�a zbyt d�ugiego lub nazbyt\n"
-"skomplikowanego: musisz go zapami�ta� bez k�opotu."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"By zwi�kszy� poziom bezpiecze�stwa systemu nale�y w��czy�:\n"
-"\"U�yj pliku shadow\" i \"U�yj d�ugich hase� 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 ""
-"Je�eli Twoja sie� u�ywa NIS (systemu informacji sieciowej),\n"
-"wybierz \"U�yj NIS\". \n"
-"Je�eli nie jeste� pewien, spytaj administratora sieci."
-
-#: ../../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"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\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 in doubt, DrakX will display a dialog with various options.\n"
 "\n"
+" * \"Boot loader to use\": you have three choices:\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 ""
-"Powiniene� utworzy� jedno lub wi�cej kont \"zwyk�ych\" u�ytkownik�w\n"
-"b�d�cych przeciwie�stwem konta \"uprzywilejowanego\" u�ytkownika\n"
-"- roota. Mo�esz utworzy� jedno lub wi�cej kont dla ka�dej osoby, kt�rej\n"
-"chcesz umo�liwi� korzystanie z komputera. Pami�taj, �e ka�de konto ma\n"
-"indywidualne ustawienia (�rodowisko graficzne, ustawienia program�w,itp.)\n"
-"oraz w�asny \"katalog domowy\", w kt�rych te ustawienia s� zapisywane.\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"
-"Przede wszystkim, utw�rz konto dla samego siebie!. Nawet je�li jeste�\n"
-"jedynym u�ytkownikiem komputera, NIE KORZYSTAJ z konta roota do\n"
-"codziennej pracy: jest to bardzo ryzykowne. Cz�sto zdarza si� \n"
-"zniszczenie systemu przez zwyk�� liter�wk�\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"
-"Powiniene� wi�c do normalnej pracy w systemie korzysta� z konta\n"
-"zwyk�ego u�ytkownika, natomiast konto roota wykorzystywa� tylko\n"
-"do administracji oraz konfiguracji systemu."
-
-#: ../../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 ""
-"Utworzenie dysku startowego jest bardzo zalecane. Je�li nie b�dzie\n"
-"mo�na uruchomi� komputera, b�dzie to jedyny prosty spos�b\n"
-"przywr�cenia dzia�ania systemu bez reinstalacji."
-
-#: ../../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 ""
-"Powiniene� wskaza�, gdzie chcesz\n"
-"umie�ci� informacje wymagane do uruchomienia GNU/Linuxa\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"
-"Je�li nie wiesz dok�adnie, co robisz, wybierz\n"
-" \"Pierwszy sektor na dysku (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)."
+"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 ""
-"Standardowy wyb�r to \"/dev/hda\", czyli pierwszy  dysk twardy (primary\n"
-" IDE) lub  \"/dev/sda\" pierwszy dysk SCSI (first SCSI disk)."
 
-#: ../../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 to programy rozruchowe: potrafi� uruchomi�\n"
 "GNU/Linux lub inny system operacyjny, zainstalowany na twoim komputerze.\n"
@@ -3387,170 +3086,152 @@ msgstr ""
 "usuni�cie ich z listy. W tej sytuacji musisz jednak posiada� dyskietki\n"
 "startowe, by je uruchomi�."
 
-#: ../../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"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"Powiniene� wskaza�, gdzie chcesz\n"
+"umie�ci� informacje wymagane do uruchomienia GNU/Linuxa\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
 "\n"
+"Je�li nie wiesz dok�adnie, co robisz, wybierz\n"
+" \"Pierwszy sektor na dysku (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"
+"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 ""
+"Instalator spr�buje wykry� kontroler(y) SCSI na magistrali PCI.\n"
+"Je�li je odnajdzie i rozpozna, kt�re sterowniki nale�y u�y�\n"
+"za�aduje je automatycznie.\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 ""
-" G��wne opcje LILO i Grub to:\n"
-"  - urz�dzenie startowe:  urz�dzenie, kt�re zawiera sektor �aduj�cy\n"
-"zwykle jest to \"/dev/hda\". Wybierz tak, je�eli nie masz pewno�ci.\n"
-"\n"
-"\n"
-"  - Czas op�nienia uruchamiania domy�lnego systemu:\n"
-"okre�la, ile czasu masz do rozpocz�cia uruchamiania domy�lnego systemu.\n"
-"Przydatne bywa w systemach, kt�re s� tak skonfigurowane, �e\n"
-"uruchamianie nast�puje z twardego dysku, natychmiast po uaktywnieniu\n"
-"klawiatury. Program �aduj�cy nie czeka, je�eli op�nienie jest r�wne zero,\n"
-"lub pominiesz t� opcj�,\n"
-" \n"
+"Je�li posiadasz kontroler  SCSI ISA, lub PCI, ale instalator nie\n"
+"wykryje sterownika do niego, zostaniesz zapytany, czy w Twoim\n"
+"systemie istnieje kontroler SCSI. Je�li nie masz �adnego, odpowiedz\n"
+"\"Nie\", je�li masz jeden lub wi�cej, odpowiedz \"Tak\". Uka�e si�\n"
+"w�wczas lista sterownik�w, z kt�rej nale�y wybra� w�a�ciwy.\n"
 "\n"
-"  - Tryb graficzny: okre�la tryb tekstowy VGA, kt�ry powinien by� wybrany\n"
-"podczas �adowania. Opcje to:\n"
 "\n"
-"    * normal: wybierz tryb 80x25.\n"
+"Po wybraniu sterownika, instalator spyta Ci�, czy chcesz okre�li�\n"
+"opcje dla niego. Pozw�l sterownikowi automatycznie wykry� \n"
+"ustawienia, zazwyczaj dzia�a to dobrze\n"
 "\n"
-"    * <numer>: wybierz tryb o danym numerze.  \n"
 "\n"
-"  - Wyczy�� \"/tmp\" po ka�dym prze�adowaniu: je�li chcesz skasowa�\n"
-" wszystkie pliki i katalogi znajduj�ce si� w \"/tmp\" po prze�adowaniu, "
-"zaznacz t� opcj�.  - Okre�l rozmiar pami�ci, je�li trzeba; nie istnieje "
-"niestety standardowa metoda\n"
-"sprawdzania w BIOS-ie ilo�ci pami�ci. W konsekwencji Linux mo�e "
-"nieprawd�owo\n"
-"wykry� wielko�� pami�ci RAM w twoim komputerze. Nale�y pami�ta�, �e r�nica\n"
-"2 do 4 MB mi�dzy rozmiarem pami�ci wykrytym, a rzeczywistym jest normalna."
+"Je�li nie, podaj sterownikowi opcje znalezione w dokumentacji,\n"
+"na stronie producenta sprz�tu (je�li masz dost�p do Internetu)\n"
+"lub takie, jak w Windows (je�li je posiadasz). Podr�cznik instalacji\n"
+"pomo�e Ci odnale�� potrzebne parametry."
 
-#: ../../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"
-"\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"
-"\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 ""
-"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"
@@ -3585,10 +3266,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"
@@ -3620,275 +3301,159 @@ 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"
-"\n"
-"\n"
-"  - Root: The root device or '/' for your Linux installation.\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"
-"  \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"
+" * 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"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
+"Yaboot main options are:\n"
 "\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
 "\n"
+"  - Init Message: A simple text message that is displayed before the boot\n"
+"prompt.\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 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"
-"  - 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"
+"  - 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"
 "\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"
-"  - 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 CD Boot?: Checking this option will allow you to choose 'C' for "
+"CD at\n"
+"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."
-
-#: ../../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 will allow 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!"
-msgstr ""
-"SILO to program rozruchowy dla SPARC: pozwala on uruchomi�\n"
-"GNU/Linux lub inny system operacyjny, zainstalowany na twoim komputerze.\n"
-"Normalnie inne systemy s� wykrywane i instalowane. Je�eli tak nie jest,\n"
-"powiniene� \"r�cznie\" wprowadzi� odpowiednie dane. B�d� ostro�ny\n"
-"i wybierz w�a�ciwe parametry.\n"
 "\n"
-" \n"
-"Mo�esz oczywi�cie r�wnie� uniemo�liwi� dost�p do nich przy starcie przez \n"
-"usuni�cie ich z listy. W tej sytuacji musisz jednak posiada� dyskietki "
-"startowe\n"
-"by je uruchomi�."
+"  - 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"
+"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 ""
-"G��wne opcje SILO to:\n"
-"  - urz�dzenie startowe:  urz�dzenie, kt�re zawiera sektor �aduj�cy\n"
-"     Je�li nie wiesz dok�adnie, co chcesz zrobi�, wybierz     \"Pierwszy "
-"sektor     dysku (MBR)\"\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"
-"  - Czas op�nienia uruchamiania domy�lnego systemu:\n"
-"    okre�la, ile czasu masz do rozpocz�cia uruchamiania domy�lnego systemu.\n"
-"    To przydaje si� w systemach, kt�re s� tak skonfigurowane, �e     "
-"uruchamianie nast�puje z twardego dysku, natychmiast po w�aczeniu   "
-"klawiatury. Program �aduj�cy nie czeka, je�eli op�nienie jest r�wne zero,\n"
-"    lub pominiesz t� opcj�."
-
-#: ../../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"
+" * \"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"
-"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 ""
-"Przyszed� czas na konfiguracj� systemu X Window, kt�ry jest rdzeniem\n"
-"GUI (graficznego interfejsu u�ytkownika) GNU/Linuxa. W tym celu trzeba\n"
-"skonfigurowa� kart� graficzn� oraz monitor. Wi�kszo�� krok�w jest\n"
-"zautomatyzowana, tak wi�c Twoje zadanie polega na weryfikacji tego,\n"
-"co zosta�o zrobione oraz akceptowaniu ustawie� :)\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"
-"Kiedy konfiguracja zostanie zako�czona, X-y zostan� uruchomione\n"
-"(o ile tego chcesz), by� mo�na by�o sprawdzi�, czy ustawienia s� "
-"odpowiednie\n"
-"Je�li nie s� w�a�ciwe, mo�esz si� cofn�� i zmieni� je, tak wiele\n"
-"razy jak jest to potrzebne."
-
-#: ../../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 ""
-"Je�eli z konfiguracj� X-�w jest co� nie tak, u�yj tych opcji,\n"
-"w celu poprawnego skonfigurowania 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 ""
-"Je�eli chcesz u�ywa� graficznego trybu przy logowaniu si� w systemie \n"
-"wybierz \"Tak\". W przeciwnym wypadku wybierz \"Nie\"."
-
-#: ../../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 ""
-"Mo�esz okre�li� poziom bezpiecze�stwa systemu. Szczeg�owe informacje na ten "
-"temat znajduj� si� w podr�czniku.\n"
-"Je�li nie wiesz co wybra�, zachowaj domy�lne ustawienia.\n"
+"Wybierz dysk, kt�ry chcesz wykasowa�, by za�o�y� na nim\n"
+"partycje Mandrake Linux. Pami�taj, �e wszystkie dane z tego\n"
+"dysku zoastan� utracone bez mo�liwo�ci odzyskania."
 
-#: ../../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 ""
-"Teraz nast�pi ponowne uruchomienie systemu.\n"
+"Wybierz \"OK\", je�li chcesz usun�� dane na wszystkich partycjach\n"
+"istniej�cych na dysku. Pami�taj, po wybraniu \"OK\", nie b�dzie\n"
+"mo�liwe odzyskanie �adnych danych z partycji (tak�e Windows)\n"
 "\n"
-"Tw�j nowy Linux Mandrake zostanie za�adowany automatycznie.\n"
-"Je�eli chcia�by� za�adowa� inny z posiadanych system�w operacyjnych,\n"
-"przeczytaj dodatkowe instrukcje."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Wyb�r j�zyka"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Rodzaj instalacji"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Wykrywanie dysk�w"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Konfiguracja myszy"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Wyb�r klawiatury"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Bezpiecze�stwo"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Systemy plik�w"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formatowanie"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Wyb�r pakiet�w"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Instalacja pakiet�w"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Has�o roota"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "U�ytkownicy"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Konfiguracja sieci"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "R�ne"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Konfiguracja us�ug"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Dysk startowy"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Program rozruchowy"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Konfiguracja X"
+"\n"
+"Wybierz \"Anuluj\", by anulowa� t� operacj� bez utraty danych."
 
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Wyj�cie z instalacji"
+#: ../../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"
@@ -3912,20 +3477,20 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz zainstalowa� te serwery?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Nie u�ywaj rozg�aszania przy braku domeny NIS"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "W�� sformatowan� (FAT) dyskietk� do stacji %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "Ten dysk nie jest sformatowany."
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3933,30 +3498,20 @@ msgstr ""
 "By u�y� zapisanej list� pakiet�w, nale�y uruchomi� instalacj� z opcj� "
 "''linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "B��d odczytu pliku $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "B��d odczytu pliku %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 "Przetestuj mysz"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "By uaktywni� mysz,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "RUSZ KӣKIEM!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3966,7 +3521,7 @@ msgstr ""
 "Cz�� sprz�tu w Twoim komputerze wymaga \"firmowych\" sterownik�w.\n"
 "Wi�cej informacji na ten temat uzyskasz z %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"
@@ -3976,11 +3531,11 @@ msgstr ""
 "W tym celu, utw�rz partycj� ( lub kliknij na istniej�c�),\n"
 "nast�pnie Wybierz \"Punkt montowania\" `/'"
 
-#: ../../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 "Musisz mie� partycj� wymiany (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"
@@ -3990,55 +3545,59 @@ msgstr ""
 "\n"
 "Kontynuowa� mimo to?"
 
-#: ../../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 "Musisz mie� partycj� FAT zamontowan� w /boot/efi"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Wykorzystaj wolne miejsce"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Brak wolnego miejsca do stworzenia nowych partycji"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "U�yj istniej�cej partycji"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Brak istniej�cych partycji do wykorzystania"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Wykorzystaj miejsce na partycji Windows na plikopartycj�"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Kt�r� partycj� chcesz u�y� dla Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Okre�l rozmiary"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Rozmiar partycji root w MB:"
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Rozmiar partycji swap w MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Wykorzystaj wolne miejsce na partycji Windows"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Kt�r� partycj� chcesz zmniejszy�?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Obliczanie granic systemu plik�w Windows"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4047,11 +3606,11 @@ msgstr ""
 "Program zmniejszaj�cy partycj� FAT nie potrafi obs�u�y�\n"
 "Twojej partycji. Wyst�pi� nast�puj�cy b��d: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr "Twoja partycja Windows jest zbyt sfragmentowana, uruchom \"defrag\""
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4070,21 +3629,21 @@ msgstr ""
 "Warto r�wnie� zarchiwizowa� dane na dysku.\n"
 "Je�li jeste� pewny, wybierz OK."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Jaki ma by� docelowy rozmiar partycji Windows?"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "partycja %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Zmiana rozmiaru partycji FAT nie powiod�a si�: %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)"
@@ -4092,34 +3651,34 @@ msgstr ""
 "Nie ma partycji FAT do zmiany rozmiaru lub u�ycia jako plikopartycj�n(lub "
 "brak wolnego miejsca)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Wyma� ca�y dysk"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Usu� 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 ""
 "Masz wi�cej ni� 1 dysk twardy, na kt�rym z nich chcesz zainstalowa� linuxa?"
 
-#: ../../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 ""
 "WSZYSTKIE istniej�ce partycje i dane na nich zostan� usuni�te z dysku %s"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Zaawansowany podzia� na partycje"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "U�yj fdiska"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4128,28 +3687,28 @@ msgstr ""
 "Mo�esz teraz tworzy� partycje  %s \n"
 "Gdy sko�czysz, pami�taj o zapisaniu u�ywaj�c `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Masz za ma�o wolnego miejsca na partycji Windows"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "Brak miejsca na instalacj�"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "Kreator podzia�u na partycje DrakX proponuje nast�puj�ce rozwi�zania:"
+msgstr "Kreator podzia�u na partycje proponuje nast�puj�ce rozwi�zania:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Partycjonowanie nie powiod�o si�: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Uruchamianie sieci"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Zatrzymywanie sieci"
 
@@ -4161,12 +3720,12 @@ msgstr ""
 "Wyst�pi� jaki� b��d. Nie mo�na poprawnie go obs�u�y�\n"
 "Kontynuuj na w�asn� odpowiedzialno��."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Powielony punkt montowania %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"
@@ -4178,16 +3737,16 @@ msgstr ""
 "Sprawd� p�yt� w innym komputerze u�ywaj�c polecenia:\n"
 "\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Witamy w %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Niedost�pna stacja dyskietek"
 
-#: ../../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"
@@ -4201,32 +3760,32 @@ msgstr "Okre�l rozmiar przeznaczony na instalacj�"
 msgid "Total size: "
 msgstr "Ca�kowity rozmiar: "
 
-#: ../../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 "Wersja: %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 "Rozmiar: %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 "Wybierz pakiety do zainstalowania"
 
-#: ../../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 "Informacje"
 
-#: ../../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 "Instalacja"
 
-#: ../../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 "Instalowanie"
 
@@ -4234,7 +3793,7 @@ msgstr "Instalowanie"
 msgid "Please wait, "
 msgstr "Prosz� czeka�, "
 
-#: ../../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 "Pozosta�o czasu "
 
@@ -4243,21 +3802,21 @@ msgid "Total time "
 msgstr "Ca�kowity czas "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Przygotowywanie instalacji"
 
-#: ../../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 "Instalowanie pakietu %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 "Kontynuowa�?"
 
-#: ../../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 "Wyst�pi� b��d porz�dkowania pakiet�w:"
 
@@ -4265,10 +3824,10 @@ msgstr "Wyst�pi� b��d porz�dkowania pakiet�w:"
 msgid "Use existing configuration for X11?"
 msgstr "Wykorzysta� istniej�c� konfiguracj� 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 ""
@@ -4276,17 +3835,21 @@ msgstr ""
 "Je�li tak si� stanie, spr�buj instalacji w trybie tekstowym.\n"
 "By j� uruchomi�, naci�nij F1 podczas startu z CD i wpisz \"text\"."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Klasa instalacji"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Wybierz jedn� z nast�puj�cych klas instalacji:"
 
-#: ../../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 "Ca�kowity rozmiar dla wybranych grup to oko�o %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"
@@ -4300,7 +3863,7 @@ msgstr ""
 "Ma�y procent spowoduje instalacj� tylko najwa�niejszych pakiet�w,\n"
 "100%% spowoduje zainstalowanie wszystkich wybranych pakiet�w."
 
-#: ../../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"
@@ -4317,83 +3880,67 @@ msgstr ""
 "najwa�niejszych pakiet�w,\n"
 "Wyb�r  %d%% spowoduje zainstalowanie tylu pakiet�w ile si� da."
 
-#: ../../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 "W nast�pnym kroku mo�na b�dzie wybra� bardziej precyzyjnie"
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Procent pakiet�w do instalacji"
 
-#: ../../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 "Wyb�r grup pakiet�w"
 
-#: ../../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 "Samodzielny wyb�r pakiet�w"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "Poka� automatycznie wybrane pakiety"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Rozwi� drzewo"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Zwi� drzewo"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Prze��cz mi�dzy p�askim i grupowym sortowaniem"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Ca�kowity rozmiar: %d  / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Pakiet uszkodzony"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nazwa: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Wa�no��: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Ca�kowity rozmiar: %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 "Nie mo�esz wybra� tego pakietu. Nie ma ju� miejsca, by go zainstalowa�"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Zostan� zainstalowane nast�puj�ce pakiety"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Zostan� usuni�te nast�puj�ce pakiety"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Nie mo�na zmieni� statusu tego pakietu."
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Ten pakiet jest konieczny, nie mo�na go pomin��"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "Nie mo�na odznaczy� tego pakietu. Zosta� ju� zainstalowany."
 
-#: ../../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?"
@@ -4401,24 +3948,40 @@ msgstr ""
 "Ten pakiet musi by� uaktualniony.\n"
 "Jeste� pewien, �e chcesz go odznaczy�?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Nie mo�na odznaczy� tego pakietu. Musi zosta� zamieniony na nowszy"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Poka� automatycznie wybrane pakiety"
+
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "Odczytaj/Zapisz na dyskietk�"
+
+#: ../../install_steps_gtk.pm_.c:461
+msgid "Updating package selection"
+msgstr "Uaktualnianie listy wybranych pakiet�w"
+
+#: ../../install_steps_gtk.pm_.c:466
+msgid "Minimal install"
+msgstr "Minimalna instalacja"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Szacowanie"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Prosz� czeka�, trwa przygotowywanie instalacji"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d pakiet�w"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4478,15 +4041,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 "Akceptuj"
 
-#: ../../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 "Odrzu�"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4500,7 +4063,7 @@ msgstr ""
 "W�� p�yt� zatytu�owan� \"%s\" do kieszeni czytnika i naci�nij Ok.\n"
 "Je�li jej nie masz, naci�nij Anuluj, by omin�� instalacj� pakiet�w z niej"
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Wyst�pi� b��d podczas instalowania pakiet�w:"
 
@@ -4508,35 +4071,21 @@ msgstr "Wyst�pi� b��d podczas instalowania pakiet�w:"
 msgid "An error occurred"
 msgstr "Wyst�pi� b��d"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Wybierz j�zyk u�ywania systemu"
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr ""
-"Mo�esz wybra� inne j�zyki, kt�re chcesz mie� do dyspozycji po instalacji"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Wszystkie"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Umowa licencyjna"
 
-#: ../../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"
@@ -4590,7 +4139,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"
@@ -4627,7 +4176,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"
@@ -4648,13 +4197,13 @@ msgid ""
 msgstr ""
 "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"
@@ -4708,7 +4257,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"
@@ -4745,7 +4294,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"
@@ -4764,103 +4313,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 "Klawiatura"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Wybierz uk�ad klawiatury."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "Oto lista dost�pnych uk�ad�w klawiatury"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Klasa instalacji"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Okre�l klas� instalacji"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Instalacja/Uaktualnienie"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Czy to instalacja, czy uaktualnienie?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Zalecana"
 
-#: ../../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 "Dla eksperta"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Uaktualnienie"
 
-#: ../../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 "Wybierz typ myszy."
 
-#: ../../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 myszy"
 
-#: ../../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 "Do kt�rego portu szeregowego jest pod��czona mysz?"
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "Emulacja przycisk�w"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "Emulacja 2 przycisku"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "Emulacja 3 przycisku"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Konfiguracja kart 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 "Konfiguracja 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 "brak dost�pnych partycji"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Przeszukiwanie partycji w celu okre�lenia punkt�w montowania"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Wybierz punkty montowania"
 
-#: ../../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"
@@ -4878,86 +4423,128 @@ msgstr ""
 "\n"
 "Czy zgadzasz si� na utrat� wszystkich partycji?\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 nie mo�e odczyta� poprawnie tablicy partycji.\n"
+"Instalator nie mo�e odczyta� poprawnie tablicy partycji.\n"
 "Kontynuuj na w�asn� odpowiedzialno��!"
 
-#: ../../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 ""
+"Brak wolnej przestrzeni na 1MB bootstrap. Instalacja b�dzie kontynuowana,\n"
+"lecz nale�y utworzy� partycj� bootstrap."
+
+#: ../../install_steps_interactive.pm_.c:349
+msgid "No root partition found to perform an upgrade"
+msgstr ""
+"Nie znaleziono partycji root, na kt�rej mo�na przeprowadzi� aktualizacj�"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Partycja root"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Kt�ra partycja jest w Twoim systemie partycj� root (/)"
 
-#: ../../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 ""
 "Nale�y zrestartowa� komputer w celu uaktywnienia zmian w tablicy partycji"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Wybierz partycje do sformatowania"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Sprawdzi� fizycznie partycje?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Formatowanie partycji"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Tworzenie i formatowanie plikopartycji %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Wielko�� partycji wymiany jest niewystarczaj�ca, nale�y j� zwi�kszy�"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Wyszukiwanie dost�pnych pakiet�w"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Wyszukiwanie pakiet�w do uaktualnienia"
 
-#: ../../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 "Zbyt ma�o miejsca na instalacj� lub uaktualnienie (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Pe�na (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimalna (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Zalecana (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "U�ytkownika"
 
-#: ../../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 ""
+"Prosz� wybra� odczytanie lub zapis listy wybranych pakiet�w\n"
+"na dyskietk�. Format jest identyczny z dyskiem automatycznej\n"
+"instalacji."
+
+#: ../../install_steps_interactive.pm_.c:525
+msgid "Load from floppy"
+msgstr "Odczytaj z dyskietki"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "Odczytywanie z dyskietki"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "Wyb�r pakiet�w"
+
+#: ../../install_steps_interactive.pm_.c:532
+msgid "Insert a floppy containing package selection"
+msgstr "W�� dyskietk� zawieraj�c� list� wybranych pakiet�w"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Zapisz na dyskietk�"
+
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Selected size is larger than available space"
 msgstr "Wybrany rozmiar przekracza dost�pne miejsce"
 
-#: ../../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"
@@ -4967,12 +4554,12 @@ msgstr ""
 "Je�eli nie masz �adnej z p�yt z listy, kliknij Anuluj.\n"
 "Je�eli niekt�rych p�yt z listy nie masz, odznacz je i kliknij  Ok."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM oznaczony \"%s\" "
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4981,11 +4568,21 @@ msgstr ""
 "Instalowanie pakietu %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Konfiguracja poinstalacyjna"
 
-#: ../../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 "W�� dyskietk� startow� do stacji %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "W��  dyskietk� z uaktalnionymi modu�ami do stacji %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -5048,93 +4645,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 "Wybierz mirror, z kt�rego chcesz pobra� pakiety"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "��czenie z mirrorem - pobieranie listy dost�pnych pakiet�w"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Wybierz pakiety do zainstalowania."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Wybierz swoj� stref� czasow�."
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "Czy ustawi� zegar sprz�towy na czas GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+msgid "Hardware clock set to GMT"
+msgstr "Ustawienie zegar sprz�towego na czas GMT"
+
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr "Automatyczna synchronizacja czasu (przy u�yciu NTP)"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "Serwer NTP"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Zdalny serwer CUPS"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Brak drukarki"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "R�ne"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Mysz"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
-#: ../../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 "Drukarka"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "Karta ISDN"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Karta d�wi�kowa"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "Karta TV"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Jakiego systemu wydruku zamierzasz u�ywa�?"
+#: ../../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 "Pliki lokalne"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Has�o roota"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Bez has�a"
 
-#: ../../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 "To has�o jest zbyt proste ( musi by� co najmniej %d znak�w)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "U�yj NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autentykacja"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "��te strony"
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "Autentykacja LDAP"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
-msgstr "Uwierzytelnienie NIS"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr "LDAP Base dn"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:951
+msgid "LDAP Server"
+msgstr "Serwer LDAP"
+
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
+msgstr "Autentykacja NIS"
+
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "Domena NIS"
 
-#: ../../install_steps_interactive.pm_.c:916
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "Serwer 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 "
@@ -5160,19 +4797,19 @@ msgstr ""
 "Je�li chcesz utworzy� dysk startowy dla swojego systemu, w�� dyskietk�\n"
 "do stacji i wybierz \"OK\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Pierwsza stacja dyskietek"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Druga stacja dyskietek"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Pomi�"
 
-#: ../../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 "
@@ -5193,33 +4830,45 @@ msgstr ""
 "u�atwiaj�c naprawienie systemu w przypadku awarii.\n"
 "Czy chcesz dla swojego systemu utworzy� dysk startowy?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Niestety, stacja dyskietek jest niedost�pna."
 
-#: ../../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 ""
 "Wybierz stacj� dyskietek, kt�rej u�yjesz do stworzenia dysku startowego"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "W�� dyskietk� do stacji %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Tworzenie dysku startowego"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Przygotowanie programu rozruchowego"
 
-#: ../../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 ""
+"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"
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "Czy chcesz u�ywa� 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?"
@@ -5227,17 +4876,23 @@ msgstr ""
 "B��d podczas instalowania aboot. \n"
 "Wymusi� instalacj�, nawet gdyby grozi�o to zniszczeniem pierwszej partycji?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Program rozruchowy"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 "Instalacja programu rozruchowego nie powiod�a si�. Wyst�pi� nast�puj�cy b��d:"
 
-#: ../../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 ""
@@ -5248,38 +4903,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 "Niski"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "�redni"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Wysoki"
 
-#: ../../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 "Wybierz poziom bezpiecze�stwa"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"Czy utworzy� dyskietk� instalacji automatycznej w celu powielenia instalacji?"
-
-#: ../../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 "W�� pust� dyskietk� do stacji %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 "Tworzenie dyskietki automatycznej instalacji"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5289,31 +4940,31 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz teraz zako�czy�?"
 
-#: ../../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 ""
 "Gratulacje, instalacja zosta�a zako�czona.\n"
 "Usu� p�yt� i (lub) dyskietk� z nap�d�w i naci�nij enter, by zrestartowa�.\n"
 "\n"
-"Informacje o poprawkach dotycz�cych tej wersji Linux-Mandrake\n"
-"znajdziesz na stronach http://www.linux-mandrake.com/.\n"
+"Informacje o poprawkach dotycz�cych tej wersji Mandrake Linux\n"
+"znajdziesz na stronach http://www.mandrakelinux.com/.\n"
 "Informacje o konfiguracji systemu znajduj� si�\n"
-"w Oficjalnym Podr�czniku U�ytkownika Linux Mandrake."
+"w Oficjalnym Podr�czniku U�ytkownika Mandrake Linux."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Tworzenie dyskietki automatycznej instalacji"
 
-#: ../../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"
@@ -5328,41 +4979,58 @@ msgstr ""
 "\n"
 "Mo�na za�yczy� sobie odtworzenia instalacji.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automatyczna"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Odtw�rz ponownie"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Zapisz list� wybranych pakiet�w"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Instalacja Linux-Mandrake %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Instalacja 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> mi�dzy element.  | <Spacja> wyb�r | <F12> nast�pny ekran "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "brakuje kdesu"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Wybierz czynno��"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Prosz� czeka�"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Rozwi� drzewo"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Zwi� drzewo"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Prze��cz mi�dzy p�askim i grupowym sortowaniem"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5388,267 +5056,288 @@ msgstr "Tw�j wyb�r? (domy�lnie %s)"
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Tw�j wyb�r? (domy�lnie %s, wpisz \"none\" dla �adnego) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "czeski (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 "niemiecki"
 
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:142
 msgid "Dvorak"
 msgstr "Dvoraka"
 
-#: ../../keyboard.pm_.c:127 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "hiszpa�ski"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "fi�ski"
 
-#: ../../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 "francuski"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "norweski"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "polski"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "rosyjski"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "szwedzki"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "angielski"
 
-#: ../../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 "ameryka�ski"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "alba�ski"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "arme�ski (stary)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "arme�ski - fonetyczny"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "arme�ski - fonetyczny"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "azerski (latin)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "azerski (cyrilic)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "belgijski"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "bu�garski"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "brazylijski(ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "bia�oruski"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "szwajcarski (uk�ad niemiecki)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "szwajcarski (uk�ad francuski)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "czeski (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "czeski (programisty)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "niemiecki ( bez martwych klawiszy)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "du�ski"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvoraka (US)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvoraka (norweski)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "esto�ski"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "gruzi�ski (uk�ad rosyjski)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "gruzi�ski (uk�ad �aci�ski)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "grecki"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "w�gierski"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "chorwacki"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "izraelski"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "izraelski (fonetyczny)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Ira�ski"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "islandzki"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "w�oski"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "japo�ski 106 klawiszy"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "korea�ski"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "latyno-ameryka�ski"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Macedo�ska"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "holenderski"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "litewski AZERTY"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "litewski AZERTY"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "litweski QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "litewski QWERTY - fonetyczny"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Lokalizacja"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Macedo�ska"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "holenderski"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "polski (programisty)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "polski (maszynistki)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "kanadyjski (Quebec)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "rumu�ski (qwertz)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "rumu�ski (qwerty)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "rosyjski (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "szwedzki"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "s�owe�ski"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "s�owacki (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "s�owacki (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "s�owacki (programisty)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "azerski (cyrilic)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "tajski"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "tajski"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "turecki"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "turecki (nowy)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "ukrai�ski"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "ameryka�ski (mi�dzynarodowy)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "wietnamski QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "jugos�owia�ski - (�aci�ski/cyrylica)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Zap�tlone montowanie %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Zacznij od usuni�cia logicznych dysk�w (LV)\n"
 
@@ -5760,170 +5449,231 @@ msgstr "brak"
 msgid "No mouse"
 msgstr "Brak myszy"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Przetestuj mysz"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "By uaktywni� mysz,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "RUSZ KӣKIEM!"
+
+#: ../../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 "Zako�cz"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Dalej ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Poprzedni"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Dzia�a prawid�owo?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Internet - konfiguracja"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Po��czenie z Internetem"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Czy chcesz teraz spr�bowa� po��czy� si� Internetem?"
+#: ../../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 ""
+"Njabardziej typowym sposobem po��czenia przez ADSL jest ppoe.\n"
+"Isteniej� jednak po��czenia u�ywaj�ce pptp oraz nieliczne - dhcp.\n"
+"Je�li nie wiesz, wybierz \"u�yj pppoe\""
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Testowanie po��czenia..."
+#: ../../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 "Jeste� teraz po��czony z Internetem."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "u�yj dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Ze wzgl�du na bezpiecze�stowo po��czenie zostanie teraz roz��czone."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "u�yj pppoe"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "u�yj 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 ""
-"Po��czenie z Internetem nie uda�o si�.\n"
-"Spr�buj zmieni� konfiguracj� po��czenia."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Konfiguracja sieci"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "Konfiguracja ISDN"
+"Jaki program klienta DHCP chcesz u�y�?\n"
+"Domy�lnym jest 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 ""
-"Wybierz swojego dostawc� Internetu.\n"
-"Je�li nie ma go na li�cie, wybierz \"Unlisted\""
+"Nie wykryto w systemie karty sieciowej.\n"
+"Nie mo�na skonfigurowa� tego typu po��czenia."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Konfiguracja po��czenia"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Wybierz interfejs sieciowy"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Wype�nij lub zaznacz pole poni�ej"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Prosz� wybra� kart� sieciow� kt�r� chcesz u�y� do po��czenia z Internetem"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ karty"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "nie znaleziono karty sieciowej"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "DMA karty"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Konfiguracja sieci"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "IO karty"
+#: ../../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 ""
+"Prosz� wpisa� nazw� komputera, je�li j� znasz\n"
+"Niekt�re z serwer�w DHCP wymagaj� jej do dzia�ania.\n"
+"Nazwa ta powinna by� w postaci pe�nej,\n"
+"np. \"mojkomputer.mojadomena.pl\"."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "IO_0 karty"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Nazwa komputera"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "IO_1 karty"
+#: ../../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 "Kreator konfiguracji sieci"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Numer Twojego telefonu"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Zewn�trzny modem ISDN"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Nazwa dostawcy us�ug (np. Dialog, Netia, TPSA)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Wewn�trzna karta ISDN"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Numer telefonu dostawcy us�ug"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Okre�l rodzaj po��czenia ISDN"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "DNS 1 dostawcy"
+#: ../../network/isdn.pm_.c:45
+#, fuzzy
+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 ""
+"Jaki spos�b konfiguracji ISDN preferujesz?\n"
+"\n"
+"* Stary spos�b konfiguracji przy u�yciu isdn4net. Wykorzystuje narz�dzia\n"
+"o du�ych mo�liwo�ciach, lecz jest niestandardowy i podst�pny dla "
+"pocz�tkuj�cych\n"
+"\n"
+"* Nowy spos�b konfiguracji jest �atwiejszy do zrozumienia, bardziej "
+"standardowy,\n"
+"lecz daje mniej narz�dzi.\n"
+"\n"
+"Zalecany jest nowy spos�b konfiguracji.\n"
+"\n"
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "DNS 2 dostawcy"
+#: ../../network/isdn.pm_.c:54
+msgid "New configuration (isdn-light)"
+msgstr "Nowa konfiguracjia (isdn-light)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Spos�b wybierania"
+#: ../../network/isdn.pm_.c:54
+msgid "Old configuration (isdn4net)"
+msgstr "Stara konfiguracji (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Konto (nazwa u�ytkownika)"
+#: ../../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 "Konfiguracja ISDN"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Has�o:"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Wybierz swojego dostawc� Internetu.\n"
+"Je�li nie ma go na li�cie, wybierz \"Unlisted\""
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Protok� uruchamiania"
 
-#: ../../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 "Reszta �wiata"
 
-#: ../../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 ""
 "Reszta �wiata \n"
 " bez kana�u D (linie dzier�awione)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Jakiego protoko�u chcesz u�y�?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Jaki rodzaj karty posiadasz?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Nie wiem"
 
-#: ../../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"
@@ -5935,19 +5685,19 @@ msgstr ""
 "powinny by� odpowiednie\n"
 "Je�li posiadasz kart� PCMCIA, powiniene� zna� IRQ i IO swojej karty.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Przerwij"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Kontynuuj"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Wybierz swoj� kart� 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."
@@ -5955,109 +5705,61 @@ msgstr ""
 "Wykryto kart� ISDN PCI nieznanego typu. Prosz� wybra� jedn� z listy na "
 "kolejnym ekranie."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "Nie wykryt� �adnej karty ISDN PCI. Prosz� wybra� jedn� z listy na kolejnym "
 "ekranie."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Nie wykryto w systemie karty sieciowej.\n"
-"Nie mo�na skonfigurowa� tego typu po��czenia."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Wybierz interfejs sieciowy"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Prosz� wybra� kart� sieciow� kt�r� chcesz u�y� do po��czenia z Internetem"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Interfejs sieciowy"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Zgadzasz si�?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Nale�y zrestartowa� interfejs $device:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "Konfiguracja ADSL"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Czy chcesz ��czy� si� Internetem przy uruchamianiu komputera?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Wska� port szeregowy, do kt�rego pod��czony jest modem."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Opcje dzwonienia"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Nazwa po��czenia"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Numer telefonu"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Identyfikator"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autoryzacja"
+#: ../../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 "Oparta o skrypt"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Poprzez terminal"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Domena"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Pierwszy serwer DNS (opcjonalnie)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Drugi serwer DNS (opcjonalnie)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "Nale�y zrestartowa� urz�dzenie $netc->{NET_DEVICE}. Zgadzasz si�?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6065,7 +5767,7 @@ msgstr ""
 "\n"
 "Mo�esz roz��czy� si� lub zrekonfigurowa� po��czenie."
 
-#: ../../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."
@@ -6073,11 +5775,11 @@ msgstr ""
 "\n"
 "Mo�esz zrekonfigurowa� po��czenie."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Jeste� ju� po��czony z Internetem."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -6085,102 +5787,56 @@ msgstr ""
 "\n"
 "Mo�esz po��czy� si� z Internetem lub zrekonfigurowa� po��czenie."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Nie jeste� teraz po��czony z Internetem."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Po��cz z Internetem"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Roz��cz po��czenie z Internetem"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Konfiguracja po��czenia z sieci� (LAN lub Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Internet - po�aczenie i konfiguracja"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Kreator konfiguracji sieci"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Zewn�trzny modem ISDN"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Wewn�trzna karta ISDN"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Okre�l rodzaj po��czenia ISDN"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Po��czenie z Internetem"
-
-#: ../../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 ""
-"Njabardziej typowym sposobem po��czenia przez ADSL jest ppoe.\n"
-"Isteniej� jednak po��czenia u�ywaj�ce pptp oraz nieliczne - dhcp.\n"
-"Je�li nie wiesz, wybierz \"u�yj pppoe\""
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "u�yj dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "u�yj pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "u�yj 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 "Nale�y zrestartowa� urz�dzenie %s. Zgadzasz si�?"
+msgid "We are now going to configure the %s connection."
+msgstr "B�dziemy teraz konfigrowa� po��czenie %s."
 
-#: ../../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"
-msgstr ""
-"Jaki program klienta DHCP chcesz u�y�?\n"
-"Domy�lnym jest dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "Konfiguracja sieci"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Chcesz zrestartowa� sie�?"
-
-#: ../../netconnect.pm_.c:904
-#, 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 ""
-"Wyst�pi� problem podczas restartowania sieci: \n"
 "\n"
-"%s"
+"\n"
+"\n"
+"B�dziemy teraz konfigurowa� po��czenie %s.\n"
+"\n"
+"\n"
+"By rozpocz��, naci�nij Dalej."
+
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Konfiguracja sieci"
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6191,7 +5847,7 @@ msgstr ""
 "Wybierz OK by zachowa� konfiguracj�, lub Anuluj by ponownie skonfigurowa� "
 "sie�/po��czenie z Intenetem.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6203,104 +5859,121 @@ msgstr ""
 "S�u�y on do konfiguracji po��czenia z Intenetem lub inn� sieci�.\n"
 "Je�li nie chcesz korzysta� z autodetekcji, odznacz to pole.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Wybierz profil do konfiguracji"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "U�yj autodetekcji"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Wykrywanie urz�dze�..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Po��czenie modemowe"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "wykryto na porcie %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "Po��czenie ISDN"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "wykryto %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "Po��czenie DSL (lub ADSL)"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+msgid "ADSL connection"
+msgstr "Po��czenie ADSL"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "wykryto na interfejsie %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Po��czenie przez kabl�wk�"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "wykryto po��czenie przez kabl�wk�"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "Sie� lokalna"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "wykryto kart�(y) ethernet"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Jak chcesz ��czy� si� Internetem?"
+#: ../../network/netconnect.pm_.c:190
+msgid "Choose the connection you want to configure"
+msgstr "Wybierz po��czenie, kt�re chcesz skonfigurowa�"
 
-#: ../../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 ""
-"Gratulacje, konfiguracja sieci i Internetu zosta�a zako�czona.\n"
+"Skonfigurowano r�ne sposoby po��czenia z Internetem.\n"
+"Wybierz ten, z kt�rego chcesz korzysta�.\n"
 "\n"
-"Zostanie teraz zapisana w twoim systemie."
 
-#: ../../netconnect.pm_.c:1007
-msgid ""
-"After that is done, we recommend you to restart your X\n"
-"environnement to avoid hostname changing problem."
-msgstr ""
-"Po zako�czeniu zalecane jest zrestartowanie X w celu omini�cia\n"
-"problemu wynikaj�cego ze zmian� nazwy hosta."
+#: ../../network/netconnect.pm_.c:215
+msgid "Internet connection"
+msgstr "Po��czenie z Internetem"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "nie znaleziono karty sieciowej"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Czy chcesz ��czy� si� Internetem przy uruchamianiu komputera?"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
 msgstr "Konfiguracja sieci"
 
-#: ../../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 ""
-"Prosz� wpisa� nazw� komputera, je�li j� znasz\n"
-"Niekt�re z serwer�w DHCP wymagaj� jej do dzia�ania.\n"
-"Nazwa ta powinna by� w postaci pe�nej,\n"
-"np. \"mojkomputer.mojadomena.pl\"."
+"Wyst�pi� problem podczas restartowania sieci: \n"
+"\n"
+"%s"
 
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Nazwa komputera"
+#: ../../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 ""
+"Gratulacje, konfiguracja sieci i Internetu zosta�a zako�czona.\n"
+"\n"
+"Zostanie teraz zapisana w twoim systemie.\n"
+
+#: ../../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 ""
+"Po zako�czeniu zalecane jest zrestartowanie X w celu omini�cia\n"
+"problemu wynikaj�cego ze zmian� nazwy hosta."
 
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6312,7 +5985,7 @@ msgstr ""
 "Naci�nij po prostu OK by zachowa� konfiguracj�.\n"
 "Modyfikacja p�l poni�ej spowoduje nadpisanie istniej�cej konfiguracji."
 
-#: ../../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"
@@ -6322,38 +5995,38 @@ msgstr ""
 "Ka�da pozycja powinna by� wpisana w zapisie dziesi�tnym\n"
 "oddzielonym kropkami (np. 192.168.1.1)."
 
-#: ../../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 "Konfiguracja urz�dzenia sieciowego %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (sterownik $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (sterownik %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 "Adres IP"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "Maska"
 
-#: ../../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 "Automatyczne 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 "Adres IP powinien by� w formacie typu 192.168.1.1"
 
-#: ../../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"
@@ -6365,43 +6038,149 @@ msgstr ""
 "np. \"mojkomputer.mojadomena.pl\".\n"
 "Je�li jest to potrzebne, nale�y wpisa� te� adres routera."
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "Serwer DNS"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Router"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Interfejs (np. eth0)"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Konfiguracja po�rednika (proxy)"
 
-#: ../../network.pm_.c:408
+#: ../../network/network.pm_.c:372
 msgid "HTTP proxy"
 msgstr "Po�rednik HTTP"
 
-#: ../../network.pm_.c:409
+#: ../../network/network.pm_.c:373
 msgid "FTP proxy"
 msgstr "Po�rednik 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 "Nazwa po�rednika powinna by� typu: http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Nazwa po�rednika powinna by� typu: ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Internet - konfiguracja"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Czy chcesz teraz spr�bowa� po��czy� si� Internetem?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Testowanie po��czenia..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Jeste� teraz po��czony z Internetem."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Ze wzgl�du na bezpiecze�stowo po��czenie zostanie teraz roz��czone."
+
+#: ../../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 ""
+"Po��czenie z Internetem nie uda�o si�.\n"
+"Spr�buj zmieni� konfiguracj� po��czenia."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Konfiguracja po��czenia"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Wype�nij lub zaznacz pole poni�ej"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ karty"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "DMA karty"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "IO karty"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "IO_0 karty"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "IO_1 karty"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Numer Twojego telefonu"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Nazwa dostawcy us�ug (np. Dialog, Netia, TPSA)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Numer telefonu dostawcy us�ug"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "1 DNS dostawcy (opcjonalnie)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "2 DNS dostawcy (opcjonalnie)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Wyb�r klawiatury"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Spos�b wybierania"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+msgid "Connection speed"
+msgstr "Szybko�� po��czenia"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Czas po��czenia:"
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Konto (nazwa u�ytkownika)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Has�o:"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Na tej platformie nie istniej� partycje rozszerzone"
 
-#: ../../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 "
@@ -6411,26 +6190,21 @@ msgstr ""
 "nie mo�na wykorzysta�. Jedynym rozwi�zaniem jest przesuni�cie\n"
 "partycji podstawowych, by puste miejsce by�o obok partycji rozszerzonych"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "B��d odczytu pliku %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Przywracanie z pliku %s nie powiod�o si�: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Uszkodzony plik archiwum"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "B��d zapisu do pliku %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"
@@ -6460,49 +6234,214 @@ msgstr "fajny"
 msgid "maybe"
 msgstr "taki sobie"
 
-#: ../../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 "Drukarka lokalna"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Drukarka sieciowa"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Zdalny serwer CUPS"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Sieciowy serwer lpd"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Drukarka sieciowa (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 "Serwer wydruku"
 
-#: ../../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 "Port drukarki URI:"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+#, fuzzy
+msgid "Pipe job into a command"
+msgstr "Potok do polecenia"
+
+#: ../../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 "(modu� %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Wybierz spos�b pod��czenia drukarki"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Jak jest pod��czona drukarka?"
+
+#: ../../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 ""
+"Korzystaj�c z sieciowego serwera CUPS nie musisz tutaj\n"
+"konfigurowa� �adnych drukarek; zostan� one automatycznie\n"
+"wykryte, chyba �e znajduje si� on w innej sieci, w tym przypadku\n"
+"nale�y poda� adres serwera CUPS oraz opcjonalnie numer portu."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "�aden"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Wybierz domy�lnego u�ytkownika:"
+
+#: ../../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 "Zamknij"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Drukarka sieciowa"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "Adres IP powinien by� w formacie typu 192.168.1.1"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Numer portu powinien by� liczb�"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Drukarka lokalna"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "IP serwera CUPS"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Konfiguracja sposobu uruchamiania"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Wykrywanie urz�dze�..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Testowanie port�w"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Wykryto drukark� model \"%s\" na"
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Port lokalnej drukarki"
 
-#: ../../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"
@@ -6510,37 +6449,59 @@ msgstr ""
 "Do jakiego portu jest pod��czona drukarka?\n"
 "(pami�taj, �e /dev/lp0 to odpowiednik LPT1:)\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Port drukarki:"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr "Brak nazwy urz�dzenia/pliku!"
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "Odczytywanie bazy sterownik�w CUPS..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Opcje drukarki sieciowej 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 ""
-"By u�ywa� kolejki drukarki, sieciowej nale�y poda�\n"
-"nazw� serwera wydruku, oraz nazw� kolejki na\n"
+"By u�ywa� kolejki drukarki sieciowej lpd nale�y poda�\n"
+"nazw� serwera wydruku oraz nazw� kolejki na\n"
 "serwerze, do kt�rej kierowane b�d� zadania wydruku."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "Nazwa serwera:"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Kolejka sieciowa"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Drukarka sieciowa"
+
+#: ../../printerdrake.pm_.c:320
+msgid "Remote host name missing!"
+msgstr "Nazwa serwera: brak nazwy!"
+
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Nazwa serwera: brak nazwy!"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opcje drukarki 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"
@@ -6553,29 +6514,37 @@ msgstr ""
 "adres IP serwera wydruku,nazw� u�ytkownika, grup�, has�o oraz\n"
 "oczywi�cie nazw� drukarki."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "Nazwa serwera SMB"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP serwera SMB"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Nazwa drukarki"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Grupa"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr "Nale�y podac nazw� serwera lub jego adres IP!"
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr "Brakuje nazwy udzia�u Samby!"
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "Opcje drukarki 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."
@@ -6585,59 +6554,230 @@ msgstr ""
 "nazw� kolejki drukarki, do kt�rej chcesz uzyska� dost�p,\n"
 "oraz w�a�ciw� nazw� u�ytkownika i has�o."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Serwer wydruku"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Nazwa kolejki drukarki"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr "Brakuje nazwy serwera NCP!"
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr "Brakuje nazwy kolejki NCP!"
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Opcje drukarki sieciowej"
 
-#: ../../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 ""
 "By drukowa� na drukarce sieciowej, nale�y poda�\n"
 "nazw� sieciow� drukarki oraz opcjonalnie numer portu."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Nazwa sieciowa drukarki"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Port"
+#: ../../printerdrake.pm_.c:537
+msgid "Printer host name missing!"
+msgstr "Brakuje nazy drukarki sieciowej!"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Port drukarki URI:"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Mo�na bezpo�rednio poda� URI okre�laj�ce dost�p do drukarki w 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 ""
+"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."
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr "A valid URI must be entered!"
+
+#: ../../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 ""
+"Ka�da drukarka musi mie� nazw� (na przyk�ad lp).\n"
+"Pola Opis i Lokalizacja nie musz� byc wype�niane.\n"
+"S� to komentarze dla u�ytkownik�w."
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Nazwa drukarki"
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Opis"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Lokalizacja"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Odczytywanie bazy sterownik�w CUPS..."
+
+#: ../../printerdrake.pm_.c:793
+msgid "Printer model selection"
+msgstr "Wyb�r modelu drukarki"
+
+#: ../../printerdrake.pm_.c:794
+msgid "Which printer model do you have?"
 msgstr "Jaki model drukarki posiadasz?"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "Czy chcesz sprawdzi� drukowanie?"
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Internet - konfiguracja"
+
+#: ../../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 - konfiguracja"
+
+#: ../../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 "Port musi by� dodatni� liczb� ca�kowit�!"
+
+#: ../../printerdrake.pm_.c:1094
+#, fuzzy, c-format
+msgid "Option %s must be a number!"
+msgstr "Port musi by� dodatni� liczb� ca�kowit�!"
+
+#: ../../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 "Czy chcesz wydrukowa� stron� testow�?"
+
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Testowanie port�w"
+
+#: ../../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 "Drukarka"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Standardowa"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Drukowanie stron/y testowych/ej"
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Drukowanie stron/y testowych/ej"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Drukowanie stron/y testowych/ej"
 
-#: ../../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 ""
 "Strona testowa zosta�a wys�ana do demona drukowania.\n"
 "Mo�e chwil� potrwa�, zanim pojawi si� wydruk\n"
@@ -6646,235 +6786,600 @@ msgstr ""
 "\n"
 "Czy wydruk jest prawid�owy?"
 
-#: ../../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 ""
 "Strona testowa zosta�a wys�ana do demona drukowania.\n"
 "Mo�e chwil� potrwa�, zanim pojawi si� wydruk\n"
 "Czy wydruk jest prawid�owy?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Tak, wydrukuj stron� testow� ascii"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Tak, wydrukuj graficzn� stron� testow�"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Brak drukarki"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Tak, wydrukuj obie strony testowe"
+#: ../../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 "Konfiguracja drukarki"
+#: ../../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 "Zatrzymywanie sieci"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Opcje drukarki"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Rozmiar papieru"
+#: ../../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 "Wysun�� stron� po wydruku?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Internet - konfiguracja"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Opcje sterownika 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 "Opcje g��bi kolor�w"
+#: ../../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 "Drukowa� tekst jako 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 "Usun�� efekt schodk�w?"
+#: ../../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 "Ilo�� stron na stronie wydruku"
+#: ../../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 "Lewy/Prawy margines w punktach (1/72 cala) "
+#: ../../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 "G�rny/Dolny margines w punktach (1/72 cala)"
+#: ../../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 "Dodatkowe opcje GhostScriptu"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Dodatkowe opcje dla tekstu"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Odwrotna kolejno�� stron"
+#: ../../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 "Czy chcesz skonfigurowa� drukark�?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
+"Nazwa drukarki powinna zawiera� tylko litery, cyfry i znak podkre�lenia"
 
-#: ../../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 ""
-"Istniej� nast�puj�ce kolejki wydruku.\n"
-"Mo�esz doda� nast�pne lub zmieni� istniej�ce."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "Uruchamianie CUPS"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Brak drukarki"
+
+#: ../../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 "Odczytywanie bazy sterownik�w CUPS..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Wybierz spos�b pod��czenia drukarki"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Konfiguracja Lilo/Grub"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Jak jest pod��czona drukarka?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Otwieranie po��czenia..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Wybierz spos�b pod��czenia drukarki sieciowej"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Konfiguracja sieci"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Nie skonfigurowano monitora"
+
+#: ../../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 ""
-"Przy korzystaniu z sieciowego serwera CUPS, drukarki\n"
-"zostan� automatycznie wykryte, nie ma potrzeby ich konfiguracji.\n"
-"W przypadku w�tpliwo�ci, wybierz \"Sieciowy serwer CUPS\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Konfiguracja sieci"
+
+#: ../../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 ""
-"Korzystaj�c z sieciowego serwera CUPS nie musisz tutaj\n"
-"konfigurowa� �adnych drukarek; zostan� one automatycznie\n"
-"wykryte, chyba �e znajduje si� on w innej sieci, w tym przypadku\n"
-"nale�y poda� adres serwera CUPS oraz opcjonalnie numer portu."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "IP serwera 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 "Numer portu powinien by� liczb�"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Jakiego systemu wydruku zamierzasz u�ywa�?"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Wysoki"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoidalny"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Usu� kolejk�"
+#: ../../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 ""
-"Nazwa drukarki powinna zawiera� tylko litery, cyfry i znak podkre�lenia"
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Jakiego systemu wydruku zamierzasz u�ywa�?"
+
+#: ../../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 ""
-"Ka�da drukarka wymaga nazwania (na przyk�ad lp)\n"
-"Mo�na te� zdefiniowa� inne parametry jak opis drukarki lub jej lokalizacj�\n"
-"Jak� nazw� u�y� dla tej drukarki oraz w jaki spos�b jest ona pod��czona?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Nazwa drukarki"
+#: ../../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 "Opis"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Lokalizacja"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+msgid "Select Printer Spooler"
+msgstr "Wybierz system wydruku"
+
+#: ../../printerdrake.pm_.c:1728
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Jakiego systemu wydruku zamierzasz u�ywa�?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Konfiguracja drukarki"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Opcje drukarki"
+
+#: ../../printerdrake.pm_.c:1815
+msgid "Preparing PrinterDrake ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1845
+msgid "Would you like to configure printing?"
+msgstr "Czy chcesz skonfigurowa� drukowanie?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
+msgid ""
+"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 ""
+
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Tryb zwyk�y"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Domy�lne)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Zdalny serwer CUPS"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Zdalny serwer CUPS"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+msgid "Add printer"
+msgstr "Dodaj drukark�"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Chcesz przetestowa� t� konfiguracj�?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Internet - konfiguracja"
+
+#: ../../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 "Po��czenie z Internetem"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
+msgstr "Wyb�r modelu drukarki"
+
+#: ../../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 "Drukowanie stron/y testowych/ej"
+
+#: ../../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 "Drukarka sieciowa"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Drukarka sieciowa"
+
+#: ../../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 "Chcesz zrestartowa� sie�?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Drukarka sieciowa"
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "Konfiguracja po�rednika (proxy)"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../proxy.pm_.c:30
 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?"
+"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 ""
-"Ka�da kolejka drukarki (drukuje zadanie skierowane do niej)\n"
-"wymaga nazwania (cz�sto lp) oraz przypisania katalogu na bufor.\n"
-"Jak nazwa� katalog przypisany do kolejki oraz jak drukarka jest pod��czona?"
+"Narz�dzie do konfiguracji po�rednika.\n"
+"\n"
+"Pozwala na skonfigurowanie po�rednik�w http oraz ftp\n"
+"z (lub bez) nazw� u�ytkownika oraz has�em\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 ""
+"Prosz� wprowadzi� dane po�rednika http ,\n"
+"lub pozostawi� puste, je�li z niego nie korzystasz"
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr "URL"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Nazwa kolejki:"
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+msgid "port"
+msgstr "port"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Katalog bufora:"
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "URL powinien zaczyna� si� od: http://..."
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "Pod��czenie drukarki"
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "Numer portu powinien by� liczb�"
+
+#: ../../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 ""
+"Prosz� wprowadzi� dane po�rednika ftp ,\n"
+"lub pozostawi� puste, je�li z niego nie korzystasz"
 
-#: ../../raid.pm_.c:33
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "URL powinien zaczyna� si� od: 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 ""
+"Prosz� poda� nazw� u�ytkownika po�rednika\n"
+"oraz has�o lub pozostawi� pola puste"
+
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "Nazwa u�ytkownika"
+
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "has�o"
+
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "Powt�rz has�o"
+
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "Has�a nie zgadzaj� si�. Spr�buj ponownie!"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Nie mo�na doda� partycji do sformatowanego RAID md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Nie mo�na zapisa� pliku $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Nie mo�na zapisa� pliku %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid pad�"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid pad� ( mo�e brak raidtools)?"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Za ma�o partycji dla RAID poziom %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr "Uruchamia podsystem d�wi�ku ALSA (Advanced Linux Sound Architecture)"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron - program uruchamiaj�cy okresowo zadania."
 
-#: ../../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."
@@ -6882,7 +7387,7 @@ msgstr ""
 "Apmd przekazuje przez syslog informacje o stanie akumulator�w.\n"
 "Umo�liwia tak�e zamkni�cie systemu, gdy s� one zbyt wy�adowane."
 
-#: ../../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."
@@ -6891,7 +7396,7 @@ msgstr ""
 "\"\n"
 "oraz wykonuje zadania wsadowe, gdy obci��enie systemu jest niewielkie."
 
-#: ../../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 "
@@ -6901,7 +7406,7 @@ msgstr ""
 "Cron jest standardowym programem unixowym, kt�ry zarz�dza wykonywaniem\n"
 "program�w u�ytkownika w okre�lonych przez niego porach."
 
-#: ../../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 "
@@ -6912,7 +7417,7 @@ msgstr ""
 "pracuj�cych pod konsol� Linuxa jak np. Midnigth Commander.\n"
 "Umo�liwia operacje Wytnij-Wklej oraz wyb�r opcji poprzez wyskakuj�ce menu."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
@@ -6920,7 +7425,7 @@ msgstr ""
 "HardDrake przeprowadza wykrywanie sprz�tu oraz opcjonalnie \n"
 "konfiguruje nowy lub zmieniony sprz�t."
 
-#: ../../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."
@@ -6928,7 +7433,7 @@ msgstr ""
 "Apache to serwer WWW. Jest u�ywany do udost�pniania plik�w \n"
 "HTML i CGI w Internecie/Intranecie."
 
-#: ../../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 "
@@ -6941,7 +7446,7 @@ msgstr ""
 "takich jak telnet, ftp, rsh i rlogin.\n"
 " Wy��czenie go uniemo�liwia korzystanie z tych us�ug."
 
-#: ../../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."
@@ -6949,7 +7454,7 @@ msgstr ""
 "Uruchomienie filtrowania pakiet�w dla kernela Linuxa w wersji 2.2\n"
 "zabezpiecza komputer przed atakiem z sieci."
 
-#: ../../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"
@@ -6959,7 +7464,7 @@ msgstr ""
 "pliku /etc/sysconfig/keyboard. Mog� one by� prze��czane przy pomocy\n"
 "narz�dzia kbdconfig. Powinien by� uruchomiony w wi�kszo�ci przypadk�w."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
@@ -6967,11 +7472,11 @@ msgstr ""
 "Automatyczna regenracja nag��wk�w kernela w /boot\n"
 "dla /usr/include/linux/{autoconf,version}.h"
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:42
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr "Automatyczne wykrywanie i konfiguracja sprz�tu przy uruchomieniu"
 
-#: ../../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."
@@ -6979,7 +7484,7 @@ msgstr ""
 "LinuxConf umo�liwia przeprowadzenie podczas uruchamiania\n"
 "r�nych zada� zwi�zanych z konserwacj� systemu."
 
-#: ../../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)."
@@ -6987,7 +7492,7 @@ msgstr ""
 "Lpd to demon, konieczny do prawid�owego dzia�ania lpr,a przez to ca�ego \n"
 "systemu drukowania."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
@@ -6995,7 +7500,7 @@ msgstr ""
 "Wirtualny Serwer linuxowy u�ywane jest przy tworzeniu bardzo wydajnych\n"
 "serwer�w o du�ej niezwodno�ci."
 
-#: ../../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."
@@ -7003,7 +7508,7 @@ msgstr ""
 "Named (BIND) to DNS -czyli serwer, umo�liwiaj�cy t�umaczenie\n"
 "nazw komputer�w na ich adresy 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."
@@ -7011,7 +7516,7 @@ msgstr ""
 "Montuje i odmontowuje wszystkie punkty zamontowania system�w plik�w \n"
 "NFS ( sieciowe systemy plik�w), SMB {LAN Manager/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."
@@ -7019,7 +7524,7 @@ msgstr ""
 "W��cza/wy��cza skonfigurowane interfejsy sieciowe\n"
 "podczas uruchamiania systemu."
 
-#: ../../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"
@@ -7028,7 +7533,7 @@ msgstr ""
 "NFS jest popularnym protoko�em udost�pniania plik�w w sieci TCP/IP.\n"
 "Ta us�uga uruchamia konfigurowany przez plik /etc/exports serwer NFS."
 
-#: ../../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."
@@ -7036,7 +7541,7 @@ msgstr ""
 "NFS jest popularnym protoko�em udost�pniania plik�w w sieci TCP/IP.\n"
 "Ta us�uga umo�liwia dzia�anie w NFS funkcji blokowania plik�w."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
@@ -7044,13 +7549,13 @@ msgstr ""
 "Automatycznie w�acza klawiatur� numeryczn� przy uruchamianiu \n"
 "w trybie konsoli oraz graficznym."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr ""
 "Zapewnia obs�ug� drukarek OKI dla Windows\n"
 "oraz kompatybilnych windrukarek."
 
-#: ../../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 "
@@ -7062,7 +7567,7 @@ msgstr ""
 "a wi�c bezpiecznie mo�e by� instalowany nawet na maszynach, kt�re go nie \n"
 "potrzebuj�."
 
-#: ../../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 "
@@ -7073,7 +7578,7 @@ msgstr ""
 "NFS i NIS. Je�eli Twoja maszyna jest serwerem dla protoko��w, kt�re \n"
 "wykorzystuj� RPC, nale�y go uruchomi� na starcie."
 
-#: ../../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."
@@ -7081,13 +7586,13 @@ msgstr ""
 "Postfix to agent pocztowy (MTA),\n"
 "przesy�aj�cy poczt� mi�dzy maszynami."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr "Polepsza generacj� liczb pseudolosowych."
 
-#: ../../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"
@@ -7095,7 +7600,7 @@ msgstr ""
 "Przypisuje \"surowe\" urz�dzenia do urz�dze� blokowych\n"
 "(np dysk�w) dla aplikacji typu 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"
@@ -7105,7 +7610,7 @@ msgstr ""
 "stosowany w ma�ych sieciach protok� RIP. W wi�kszych sieciach stosuje\n"
 "si� bardziej z�o�one protoko�y routingu."
 
-#: ../../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."
@@ -7113,7 +7618,7 @@ msgstr ""
 "Protok� rstat umo�liwia u�ytkownikowi sieci monitorowanie \n"
 "wydajno�ci innych maszyn w sieci."
 
-#: ../../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."
@@ -7121,7 +7626,7 @@ msgstr ""
 "Protok� rusers pozwala na sprawdzanie, kto jest zalogowany na innych,\n"
 "dost�pnych maszynach w sieci."
 
-#: ../../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)."
@@ -7130,11 +7635,11 @@ msgstr ""
 "w sieci.\n"
 "kt�re maj� w��czony demon rwho (podobny do finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
 msgstr "Uruchamia podsystem d�wi�ku w komputerze"
 
-#: ../../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."
@@ -7143,31 +7648,70 @@ msgstr ""
 "dokonywanie wpis�w do r�nych plik�w \"dziennikowych\" ( log files).\n"
 "Jego uruchomienie jest zalecane."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr "�aduje sterowniki urz�dze� USB."
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr "Uruchamia serwer czcionek (konieczny do dzia�ania 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 "Wybierz us�ugi automatycznie uruchamiane podczas startu"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Drukarka"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Tryb pracy systemu"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Opcje drukarki sieciowej lpd"
+
+# ../../share/compssUsers
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Bazy danych"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "urz�dzenie"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "uruchomione"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "zatrzymane"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Us�ugi i demony"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -7175,11 +7719,16 @@ msgstr ""
 "Niestety brak dodatkowych informacji\n"
 "o tej us�udze."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "Przy uruchamianiu"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Instalowanie pakietu %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"
@@ -7187,15 +7736,66 @@ msgstr ""
 "Nie mo�na odczyta� tablicy partycji, jest zbyt uszkodzona :(\n"
 "Mo�na pr�bowa� kontynuowa� z pustymi partycjami"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "B��d"
+
+#: ../../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 "Konfiguracja poinstalacyjna"
+
+#: ../../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 "Konfiguracja sposobu uruchamiania"
+
+#: ../../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 "Gratulacje!"
+
+#: ../../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 "Wsp�dzielenie po��czenia z Internetem"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Wsp�dzielenie po��czenia z Internetem jest w��czone"
 
-#: ../../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"
@@ -7207,31 +7807,31 @@ msgstr ""
 "\n"
 "Co chcesz zrobi�?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "wy��czy�"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "zwolni�"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "rekonfigurowa�"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Wy��czenie serwer�w..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Wsp�dzielenie po��czenia z Internetem jest wy��czone."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Wsp�dzielenie po��czenia z Internetem jest wy��czone"
 
-#: ../../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"
@@ -7243,27 +7843,19 @@ msgstr ""
 "\n"
 "Co chcesz zrobi�?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "w��czy�"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "W��czenie serwer�w..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Wsp�dzielenie po��czenia z Internetem jest teraz w��czone"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Zawarto�� pliku konfiguracyjnego nie mo�e zosta� zinterpretowana."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Niepoprawny plik konfiguracyjny"
-
-#: ../../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 "
@@ -7279,21 +7871,21 @@ msgstr ""
 "Uwaga:  wymagana jest dedykowana karta sieciowa w��czaj�ca komputer w sie� "
 "lokaln� (LAN)"
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interfejs %s (modu� %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
 msgstr "Interfejs %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Nie wykryto w systemie karty sieciowej!"
 
-#: ../../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."
@@ -7302,6 +7894,10 @@ msgstr ""
 "konfiguracji sprz�tu."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Interfejs sieciowy"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7316,7 +7912,7 @@ msgstr ""
 "\n"
 "Mo�na skonfigurowa� sie� lokaln� (LAN) przy wykorzystaniu tej karty."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -7324,22 +7920,23 @@ msgstr ""
 "Wska�, kt�ra karta sieciowa b�dzie po��czona\n"
 "z sieci� lokaln� (LAN)."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Uwaga, karta sieciowa zosta�a ju� skonfigurowana. Zostanie zrekonfigurowana."
 
-#: ../../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 ""
-"W bie��cej konfiguracji wykryto mo�liwy konflikt adres�w sieciowych: $_!\n"
+"W bie��cej konfiguracji wykryto mo�liwy konflikt adres�w sieciowych: %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Wykryto konfiguracj� firewalla!"
 
-#: ../../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."
@@ -7347,24 +7944,21 @@ msgstr ""
 "Ostrze�enie! Zosta�a wykryta istniej�ca konfiguracja firewalla. Mo�e by� "
 "konieczne dokonanie kilku r�cznych poprawek po instalacji. Kontynuowa�?"
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Konfiguracja..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Konfiguracja skrypt�w, instalowanie program�w, uruchamianie serwer�w..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Problemy z instalacj� pakietu $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Gratulacje!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Problemy z instalacj� pakietu %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 "
@@ -7374,27 +7968,27 @@ msgstr ""
 "Mo�esz udost�pnia� po��czenie z Internetem innym komputeremw sieci lokalnej, "
 "u�ywaj�c automatycznej konfiguracji sieci (DHCP)"
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
 "Konfiguracja wsp�dzielenia po��czenia  zosta�a ju� wykonana, lecz us�uga ta "
 "jest teraz wy��czona."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
 "Konfiguracja wsp�dzielenia po��czenia z Internetem zosta�a ju� wykonana "
 "jest w��czona"
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Wsp�dzielenie po��czenia z Internetem nie by�o jeszcze konfigurowane."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Konfiguracja wsp�dzielenia po��czenia z Internetem"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7409,83 +8003,82 @@ msgstr ""
 "\n"
 "Wybierz Konfiguruj, by uruchomi� kreatora.."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Konfiguracja sieci (%d karty)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
-msgstr "Profil:"
+msgstr "Profil: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "Usu� profil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Profil do usuni�cia:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Nowy profil..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Nazwa tworzonego profilu:"
+#: ../../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 "Nazwa komputera:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Dost�p do Internetu"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Rodzaj: "
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Router:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "Interfejs:"
 
-#: ../../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 "Po��czony"
 
-#: ../../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 "Nie po��czony"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Po��cz..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Roz��cz..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
 msgstr "Otwieranie po��czenia..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "Zamykanie po��czenia..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7497,51 +8090,52 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "jako root."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "System jest teraz roz��czony."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Konfiguracja dost�pu do Internetu..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "Konfiguracja sieci lokalnej"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Karta"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Sterownik"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interfejs"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protok�"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Status:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Konfiguracja sieci lokalnej..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Tryb zwyk�y"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Prosz� czeka�... �adowanie konfiguracji"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
@@ -7549,36 +8143,38 @@ msgstr ""
 "Nie skonfigurowano jeszcze �adnego interfejsu.\n"
 "Zacznij konfiguracj� przez klikni�cie na \"Konfiguruj\""
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "Konfiguracja sieci lokalnej"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Karta %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "Protok� uruchamiania"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Uruchamiany przy starcie"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "Klient DHCP"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Wy��czy�"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Uaktywnij"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "W��czy�"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Uaktywnij"
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
@@ -7586,35 +8182,27 @@ msgstr ""
 "Nie skonfigurowano jeszcze �adnego po��czenia z Internetem.\n"
 "Rozpocznij konfiguracj� przez klikni�cie na \"Konfiguruj\""
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Konfiguracja po��czenia z Internetem"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Konfiguracja po��czenia z Internetem"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Rodzaj po��czenia:"
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parametry"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "1 DNS dostawcy (opcjonalnie)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "2 DNS dostawcy (opcjonalnie)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Karta ethernet"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "Klient DHCP"
 
@@ -7683,15 +8271,30 @@ msgstr ""
 "To czwarty poziom zabezpiecze�.\n"
 "System jest ca�kowicie zamkni�ty, poziom zabezpiecze� jest maksymalny."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Ustawienie poziomu bezpiecze�stwa"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Wybierz opcje serwera"
+
+#: ../../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 "Ustawienie poziomu bezpiecze�stwa"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Centrum Sterowania"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Wyb�r u�ywanych narz�dzi"
 
@@ -7719,82 +8322,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Nie mo�na uruchomi� uaktualnienia!!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "nie znaleziono serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Emulowa� �rodkowy przycisk?"
 
-#: ../../standalone/mousedrake_.c:131
-msgid "Test the mouse here."
-msgstr "Sprawd� tutaj mysz"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "Monitorowanie sieci"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Statystyki"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "Szybko�� wysy�ania: "
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "Szybko�� odbierania: "
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Zamknij"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "Po��czenie z Internetem"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "Roz��cz po��czenie z Internetem"
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "Roz��czenie po��czenia powiod�o si�."
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "Roz��czono."
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Po��czono."
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"Po��czenie nie powiod�o si�. Sprawd� konfiguracj� w w Centrum Sterownia "
-"Mandrake."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "wys�ano: "
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "odebrano: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Po��cz"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Roz��cz"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Konfiguracja zapory sieciowej"
@@ -7825,11 +8360,79 @@ msgstr ""
 "\n"
 "Wybierz Konfiguruj, by ustawi� standardow� zapor� sieciow�"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Wyb�r j�zyka"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Rodzaj instalacji"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Wykrywanie dysk�w"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Konfiguracja myszy"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Wyb�r klawiatury"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Bezpiecze�stwo"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Systemy plik�w"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formatowanie"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Wyb�r pakiet�w"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Instalacja pakiet�w"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "U�ytkownicy"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Konfiguracja sieci"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Konfiguracja us�ug"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Dysk startowy"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Program rozruchowy"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Konfiguracja X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Wyj�cie z instalacji"
+
+#: ../../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 ""
@@ -7839,7 +8442,7 @@ msgstr ""
 "Je�li potrzebujesz silnego dedykowanego rozwi�zania,\n"
 "skorzystaj z dystrybucji Mandrake Security 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"
@@ -7857,7 +8460,7 @@ msgstr ""
 "Mo�esz w dowolnej chwili zmieni� konfiguracj� powt�rnie\n"
 "uruchomiaj�c ten program!"
 
-#: ../../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"
@@ -7869,7 +8472,7 @@ msgstr ""
 "komputera, mo�esz spokojnie odpowiedzie� tutaj NIE.\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"
@@ -7879,7 +8482,7 @@ msgstr ""
 "Czy uruchomiono serwer nazw (DNS)?\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"
@@ -7893,7 +8496,7 @@ msgstr ""
 "nale�y ostatecznie przej�� na ssh, poniewa� telnet nie jest szyfrowany,\n"
 "co daje mo�liwo�� pods�uchania has�a i w�amania si� do systemu."
 
-#: ../../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"
@@ -7904,7 +8507,7 @@ msgstr ""
 "Jest to bardzo niebezpieczne, sugerujemy by odpowiedzie� NIE\n"
 "i u�ywa� zamiast telneta ssh.\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"
@@ -7915,7 +8518,7 @@ msgstr ""
 "u�ywanie go tylko do anonimowych transfer�w, poniewa� FTP tak�e nie\n"
 "szyfruje przesy�anych hase�.\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"
@@ -7928,7 +8531,7 @@ msgstr ""
 "Je�li nie, nale�y zablokowa� t� us�ug�.\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"
@@ -7939,7 +8542,7 @@ msgstr ""
 "odbioru poczty z kont pocztowych za�o�onych na tym komputerze\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"
@@ -7951,7 +8554,7 @@ msgstr ""
 "przez inny komputer w biurze lub domu nale�y na to\n"
 "pozwoli�. Jak jest w tym przypadku?\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"
@@ -7965,7 +8568,7 @@ msgstr ""
 "Je�li nie s�ysza�e� o tym, prawdopodobnie nie potrzebujesz\n"
 "tej us�ugi."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -7977,119 +8580,104 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Nie mo�na otworzy� %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "B��d otwarcia %s do zapisu: %s\n"
 
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Programy klient�w dla r�nych protoko��w, w tym ssh"
-
-#: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Programowanie"
-
-#: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Stacja robocza"
-
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Zapora sieciowa/Router"
+msgid "Web/FTP"
+msgstr "WWW,/FTP"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Zarz�dzanie osobistymi informacjami"
+msgid "Network Computer (client)"
+msgstr "Komputer sieciowy (klient)"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Grafika"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Serwery NFS, SMB, SSH, oraz Proxy"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Office"
+msgstr "Biuro"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Komputer sieciowy (klient)"
+msgid "Gnome Workstation"
+msgstr "Stacja robocza z Gnome"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Dzwi�k: odtwarzacze mp3 i midi, miksery, itp."
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Narz�dzia do Palm Pilota lub Visior"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Korzystanie z Internetu"
+msgid "Workstation"
+msgstr "Stacja robocza"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Biuro"
+msgid "Firewall/Router"
+msgstr "Zapora sieciowa/Router"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Korzystanie z multimedi�w"
+msgid "Domain Name and Network Information Server"
+msgstr "Serwer systemu DNS"
 
 # ../../share/compssUsers
 #: ../../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 ""
-"Zestaw narz�dzi do czytania i wysy�ania poczty i grup dyskusyjnych (pin, "
-"mutt, tin) oraz przegl�dania sieci Web"
+"Programy biurowe: procesory tekstu (kword, abiword), arkusze kalkulacyjne "
+"(kspread, gnumeric), przegl�darki pdf, itp."
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Biblioteki do programowania w C i C++ , programy i pliki nag��wkowe"
-
-#: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Serwer systemu DNS"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Dzwi�k: odtwarzacze mp3 i midi, miksery, itp."
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programy do zarz�dzania finansami, np gnucash"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Podr�czniki i HOWTO o Linuksie i wolnym oprogramowaniu"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serwery baz danych PostgreSQL lub  MySQL"
+msgid "KDE Workstation"
+msgstr "Stacja robocza z KDE"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Serwery NFS, SMB, SSH, oraz Proxy"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itp"
 
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacja"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itp"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Zestawy narz�dzi dla poczty, WWW, transferu plik�w i chat"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Narz�dzia"
+msgid "Database"
+msgstr "Bazy danych"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "PostgreSQL or MySQL database server"
+msgstr "Serwery baz danych PostgreSQL lub  MySQL"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "�rodowisko graficzne"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Narz�dzia u�atwiaj�ce konfiguracj� komputera"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia - Sound"
@@ -8097,64 +8685,73 @@ msgstr "Multimedia - D�wi�k"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programy rozrywkowe: zr�czno�ciowe, planszowe, strategiczne, itp."
+msgid "Utilities"
+msgstr "Narz�dzia"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Odtwarzacze i edytory video"
+msgid "Documentation"
+msgstr "Dokumentacja"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid "Console Tools"
 msgstr "Narz�dzia dla konsoli"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programy do odtwarzania/edycji d�wi�ku i video"
+msgid "Postfix mail server, Inn news server"
+msgstr "Serwer pocztowy Postfix, serwer grup dyskusyjnych Inn"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Stacja robocza dla naukowca"
+msgid "Internet station"
+msgstr "Korzystanie z Internetu"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "editory, pow�oki, narz�dzia plikowe, terminale"
+msgid "Multimedia station"
+msgstr "Korzystanie z multimedi�w"
+
+#: ../../share/compssUsers:999
+#, fuzzy
+msgid "Configuration"
+msgstr "Konfiguracja sieci lokalnej"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Podr�czniki i HOWTO o Linuksie i wolnym oprogramowaniu"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Wi�cej pulpit�w graficznych (Gnome, IceWM)"
 
 # ../../share/compssUsers
 #: ../../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 ""
-"�rodowisko graficzne z przyjaznymi dla u�ytkownika zestawami aplikacji i "
-"narz�dzi"
+"KDE - podstawowe �rodowisko graficzne wraz z zestawem towarzysz�cych narz�dzi"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Serwer pocztowy Postfix, serwer grup dyskusyjnych Inn"
+msgid "Graphical Environment"
+msgstr "�rodowisko graficzne"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Gry"
+msgid "Development"
+msgstr "Programowanie"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache oraz Pro-ftpd"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Serwer sieciowy"
+msgid "Tools to create and burn CD's"
+msgstr "Narz�dzia do tworzenia i nagrywania CD"
+
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Komputer biurowy"
+
+# ../../share/compssUsers
+#: ../../share/compssUsers:999
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itp."
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
@@ -8162,134 +8759,1429 @@ msgid "Graphics programs such as The Gimp"
 msgstr "Programy graficzne, np. Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Komputer biurowy"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"KDE - podstawowe �rodowisko graficzne wraz z zestawem towarzysz�cych narz�dzi"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblioteki do programowania w C i C++ , programy i pliki nag��wkowe"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Wi�cej pulpit�w graficznych (Gnome, IceWM)"
+msgid "Network Computer server"
+msgstr "Serwer sieciowy"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Narz�dzia do tworzenia i nagrywania CD"
+msgid "Mail/Groupware/News"
+msgstr "Pocza/Narz�dzia pracy grupowej/News"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Nagrywanie p�yt CD"
+msgid "Game station"
+msgstr "Komputer do gier"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Archiving, emulators, monitoring"
-msgstr "Archiwizacja, emulatory, monitorowanie"
+msgid "Video players and editors"
+msgstr "Odtwarzacze i edytory video"
+
+#: ../../share/compssUsers:999
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafika"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Bazy danych"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programy rozrywkowe: zr�czno�ciowe, planszowe, strategiczne, itp."
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Programy biurowe: procesory tekstu (kword, abiword), arkusze kalkulacyjne "
-"(kspread, gnumeric), przegl�darki pdf, itp."
+"Zestaw narz�dzi do czytania i wysy�ania poczty i grup dyskusyjnych (pin, "
+"mutt, tin) oraz przegl�dania sieci Web"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "WWW,/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Serwer"
+msgid "Archiving, emulators, monitoring"
+msgstr "Archiwizacja, emulatory, monitorowanie"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
 msgid "Personal Finance"
 msgstr "Finanse osobiste"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfiguracja"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Stacja robocza z KDE"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"�rodowisko graficzne z przyjaznymi dla u�ytkownika zestawami aplikacji i "
+"narz�dzi"
 
-# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Inne pulpity graficzne"
+msgid "Clients for different protocols including ssh"
+msgstr "Programy klient�w dla r�nych protoko��w, w tym ssh"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache oraz Pro-ftpd"
+msgid "Internet gateway"
+msgstr "Bramka do Internetu"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Pocza/Narz�dzia pracy grupowej/News"
+msgid "Sound and video playing/editing programs"
+msgstr "Programy do odtwarzania/edycji d�wi�ku i video"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Stacja robocza z Gnome"
+msgid "Other Graphical Desktops"
+msgstr "Inne pulpity graficzne"
 
+# ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Bramka do Internetu"
+msgid "Editors, shells, file tools, terminals"
+msgstr "editory, pow�oki, narz�dzia plikowe, terminale"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Narz�dzia do Palm Pilota lub Visior"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programy do zarz�dzania finansami, np gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Komputer do gier"
+msgid "Games"
+msgstr "Gry"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itp."
+msgid "Personal Information Management"
+msgstr "Zarz�dzanie osobistymi informacjami"
 
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Narz�dzia u�atwiaj�ce konfiguracj� komputera"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Nagrywanie p�yt CD"
 
 # ../../share/compssUsers
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Zestawy narz�dzi dla poczty, WWW, transferu plik�w i chat"
+msgid "Scientific Workstation"
+msgstr "Stacja robocza dla naukowca"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "nie mo�na otworzy� do odczytu /etc/sysconfig/autologin: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Chcesz zrestartowa� sie�?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Zgadzasz si�?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Nale�y zrestartowa� interfejs:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Nale�y zrestartowa� urz�dzenie %s. Zgadzasz si�?"
+
+#, 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 ""
+#~ "Standardowy wyb�r to \"/dev/hda\", czyli pierwszy  dysk twardy (primary\n"
+#~ " IDE) lub  \"/dev/sda\" pierwszy dysk SCSI (first SCSI disk)."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Istniej� nast�puj�ce kolejki wydruku.\n"
+#~ "Mo�esz doda� nast�pne lub zmieni� istniej�ce."
+
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Czas po��czenia:"
+
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Wybierz domy�lnego u�ytkownika:"
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid "Spooler: "
+#~ msgstr "System wydruku: "
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ msgid "Test the mouse here."
+#~ msgstr "Sprawd� tutaj mysz"
+
+#~ msgid "Press next to continue."
+#~ msgstr "By kontynuowa�, naci�nij Dalej."
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr "Wybierz w�a�ciwy j�zyk instalacji i u�ywania systemu."
 
-#~ 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 ""
+#~ "By kontynuowa� instalacj�, musisz zaakceptowa� warunki licencji.\n"
+#~ "\n"
+#~ "\n"
+#~ "Wybierz \"Zgadzam si�\", je�li zgadzasz si� z jej warunkami.\n"
+#~ "\n"
+#~ "\n"
+#~ "Wybierz \"Nie zgadzam si�\", je�li si� z nimi nie zgadzasz.\n"
+#~ "Instalacja zostanie zako�czona bez �adnych zmian w konfiguracji."
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minut"
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Wybierz odpowiedni j�zyk i uk�ad klawiatury z listy powy�ej"
 
-#~ msgid "1 minute"
-#~ msgstr "1 minuta"
+#~ 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 ""
+#~ "Je�li chcesz, by po instalacji by�y dost�pne tak�e inne j�zyki\n"
+#~ "(poza wybranym na pocz�tku instalacji), wybierz je z listy powy�ej\n"
+#~ "Je�li chcesz wybra� wszystkie, wska� \"Wszystkie\"."
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sekund"
+#~ 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 ""
+#~ "Wybierz:\n"
+#~ "\n"
+#~ "\n"
+#~ "  - U�ytkownika: Je�li jeste� obeznany z Linuxem, masz mo�liwo��\n"
+#~ "     okre�lenia zastosowania zainstalowanego systemu. Szczeg�y poni�ej\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Ekspert: �wietnie znasz  GNU/Linux i chcesz zainstalowa� go\n"
+#~ "    w nietypowy, odpowiedni dla Ciebie spos�b . Podobnie jak w przypadku\n"
+#~ "    instalacji \"U�ytkownika\" masz mo�liwo�� okre�lenia zastosowania "
+#~ "systemu\n"
+#~ "    Ale bardzo, bardzo prosimy, NIE WYBIERAJ TEJ OPCJI, JE�LI NIE WIESZ "
+#~ "CO ROBISZ!"
+
+#~ 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 ""
+#~ "Teraz nale�y okre�li� spos�b wykorzystania komputera. \n"
+#~ "* Stacja robocza: To dokona�y wyb�r, je�li u�ywasz komputera do "
+#~ "codziennej pracy w biurze lub\n"
+#~ "  w domu.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Programowanie: wybierz t� opcj�, je�eli chcesz korzysta� z komputera do "
+#~ "tworzenia oprogramowania.\n"
+#~ "  Zostanie zainstalowane ca�e oprogramowanie umo�liwiaj�ce kompilacj� , "
+#~ "debugowanie program�w,\n"
+#~ "  oraz tworzenie pakiet�w oprogramowania.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Serwer: jest to w�a�ciwy wyb�r, je�li komputer ma byc serwerem. Mo�e to "
+#~ "by� serwer plik�w (NFS lub\n"
+#~ "  SMB ), serwer drukarek (uniksowy typu \"windowsowego\") serwer NIS, "
+#~ "serwer baz danych itp.\n"
+#~ "  Nie oczekuj zainstalowaniea �adnych wodotrysk�w typu KDE lub 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 ""
+#~ "Mo�esz teraz wybra� grupy pakiet�w, kt�re chcesz \n"
+#~ "zainstalowa� lub aktualizowa�\n"
+#~ "\n"
+#~ "\n"
+#~ "Instalator sprawdzi, czy masz na to do�� miejsca na dysku. Zostaniesz\n"
+#~ "ostrze�ony, je�li jest go zbyt ma�o. Je�li postanowisz mimo to "
+#~ "kontynuowa�,\n"
+#~ "cz�� mniej wa�nych pakiet�w nie zostanie zainstalowana.\n"
+#~ "Na dole listy znajdziesz opcj� \"Samodzielny wyb�r pakiet�w\"; \n"
+#~ "B�dziesz musia� jednak wybiera� spo�r�d ponad1000 pakiet�w ..."
+
+#~ 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 ""
+#~ "Mo�na teraz indywidualnie wybiera� pakiety do zainstalowania.\n"
+#~ "\n"
+#~ "\n"
+#~ "Klikni�cie w lewym rogu okna pakiet�w zwija lub rozwija list� pakiet�w\n"
+#~ "\n"
+#~ "\n"
+#~ "Klikni�cie na \"Prze��cz mi�dzy p�askim i grupowym sortowaniem\"\n"
+#~ "umo�liwia zobaczenie pakiet�w posortowanych alfabetycznie\n"
+#~ "\n"
+#~ "\n"
+#~ "Je��i nie chcesz by� informowany o zale�no�ciach miedzy pakietami,\n"
+#~ "kliknij na \"Automatyczne sprawdzanie zale�no�ci\". Po w��czeniu tej "
+#~ "opcji\n"
+#~ "odznaczenie pakietu spowoduje automatyczne od innych pakiet�w,\n"
+#~ "kt�re wymagaj� go do dzia�ania."
+
+#~ 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 ""
+#~ "Je�li masz wszystkie instalacyjne p�yty CD z listy powy�ej, kliknij Ok.\n"
+#~ "Je�li nie masz �adnej z tych p�yt, kliknij Anuluj.\n"
+#~ "Je�li masz niekt�re z p�yt, odznacz te, kt�rych nie masz i kliknij Ok."
+
+#~ 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 ""
+#~ "Nale�y teraz przetestowa� dzia�anie myszy. U�yj przycisk�w oraz k�ka\n"
+#~ "by sprawdzi�, czy ustawienia s� prawid�owe. Je�li nie, naci�nij \"Anuluj"
+#~ "\"\n"
+#~ "i wybierz inny sterownik.\n"
+#~ "\n"
+#~ "\n"
+#~ "Je�li instalujesz na komputerze Apple z 1-przyciskow� mysz�, masz teraz\n"
+#~ "mo�liwo�� przypisania jaki� klawiszy klawiatury w celu emulacji 2 i 3 "
+#~ "przycisku\n"
+#~ "myszy. Pozwoli to na zapewnienie pe�nej funkcjonalno�ci myszy podczas "
+#~ "pracy\n"
+#~ "na konsoli oraz w �rodowisku graficznym. "
+
+#~ 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 ""
+#~ "Wybierz w�a�ciw� opcj�, by pod��czy� komputer do Internetu\n"
+#~ "lub sieci lokalnej. Pami�taj o w��czeniu urz�dze� zewn�trznych\n"
+#~ "przed wybraniem opcji, by instalator m�g� je automatycznie wykry�.\n"
+#~ "\n"
+#~ "\n"
+#~ "Je�li nie u�ywasz sieci lokalnej ani Internetu, wybierz\n"
+#~ "\"Wy��czenie sieci\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Je�li chcesz skonfigurowa� sie� po instalacji, lub zako�czy�e�\n"
+#~ "konfigurowanie sieci, wybierz \"Zrobione\"."
+
+#~ 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 ""
+#~ "Nie wykryto modemu. Prosz� okre�li� port szeregowy, do kt�rego jest on "
+#~ "pod��czony.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dla informacji: pierwszy port szeregowy (COM1 w Windows)\n"
+#~ "w GNU/Linux nazywa si� \"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 ""
+#~ "Nale�y teraz poda� opcje po��czenia modemowego. Je�li nie wiesz,\n"
+#~ "lub nie wiesz co wpisa�, poprawne informacje otrzymasz od\n"
+#~ "Twojego dostawcy Internetu (ISP). Je�li nie wpiszesz adres�w DNS, zostan� "
+#~ "one pobrane od ISP\n"
+#~ "w trakcie po��czenia."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Je�li posiadasz zewn�trzny modem, w��cz go, by instalator m�g� go "
+#~ "automatycznie wykry�."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "W��cz modem i wybierz w�asciwy model."
+
+#~ 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 ""
+#~ "Je�li nie jeste� pewien, �e powy�sze informacje s� prawid�owe, lub\n"
+#~ "lub nie wiesz co wpisa�, poprawne informacje otrzymasz od\n"
+#~ "Twojego dostawcy Internetu (ISP). Je�li nie wpiszesz adres�w DNS, zostan� "
+#~ "one pobrane od ISP\n"
+#~ "w trakcie po��czenia."
+
+#~ 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 ""
+#~ "Mo�esz teraz, poda� nazw� hosta (je�li trzeba).\n"
+#~ "Je�li nie jeste� pewien, co wpisa�, nale�y uzyska� informacje od\n"
+#~ "Twojego dostawcy Internetu (ISP)."
+
+#~ 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 ""
+#~ "Nale�y teraz skonfigurowa� kart� sieciow�\n"
+#~ "\n"
+#~ "   * adres IP, je�eli go nie znasz, spytaj administratora sieci\n"
+#~ "     Nie wpisuj adresu IP, je�li wybra�e� \"Automatyczne IP\".\n"
+#~ "\n"
+#~ "   * mask� sieci, \"255.255.255.0\" na og� dzia�a. \n"
+#~ "      Je�eli  nie jeste� pewien, spytaj administratora sieci.\n"
+#~ "\n"
+#~ "    * Automatyczne IP: Je�eli Twoja sie� u�ywa protoko�u DHCP lub BOOTP,\n"
+#~ "      wybierz t� opcj�. Je�eli nie jeste� pewien, spytaj administratora "
+#~ "sieci.\n"
+#~ "      W przypadku wybranie tej opcji nie nale�y wpisywa� adresu IP"
+
+#~ 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 ""
+#~ "Mo�esz teraz, poda� nazw� hosta (je�li trzeba).\n"
+#~ "Je�li nie jeste� pewien, co wpisa�, nale�y uzyska� informacje od "
+#~ "administratora sieci."
+
+#~ 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 ""
+#~ "Mo�esz teraz, poda� nazw� hosta (je�li trzeba).\n"
+#~ "Je�li nie jeste� pewien, co wpisa�, pozostaw to pole puste."
+
+#~ 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 ""
+#~ "Mo�esz teraz poda� opcje po��czenia modemowego. Je�eli ich nie znasz, \n"
+#~ "skontaktuj si� z dostawc� Internetu (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 ""
+#~ "Je�li b�dziesz korzysta� z serwer�w po�rednicz�cych, skonfiguruj je "
+#~ "teraz.\n"
+#~ "Je�eli nie jeste� pewien, spytaj administratora sieci lub dostawcy "
+#~ "Internetu."
+
+#~ 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 ""
+#~ "Mo�esz u�y� pakiet�w kryptograficznych, je�eli Twoje po��czenie \n"
+#~ "z Internetem zosta�o odpowiednio skonfigurowane. Zacznij od wyboru "
+#~ "mirrora\n"
+#~ "(miejsca, sk�d b�dziesz �ci�ga� pakiety) i wybierz pakiety do instalacji\n"
+#~ "\n"
+#~ "\n"
+#~ "Pami�taj, �e wyb�r mirrora i pakiet�w musi by� zgodny z polskim prawem."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr "Nale�y teraz okre�li� stref� czasow� miejsca, w kt�rym mieszkasz."
+
+#~ 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 ""
+#~ "Mo�esz skonfigurowa� drukark� lokaln� (pod��czon� bezpo�rednio do\n"
+#~ "Twojego komputera), lub sieciow� (dost�pn� poprzez sie� Unix, Netware\n"
+#~ "lub 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 ""
+#~ "Je�li chcesz mie� mo�liwo�� drukowania, wybierz system wydruku\n"
+#~ "(dost�pne s� CUPS i LPR)\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS to nowy, silny i elastyczny system wydruku dla system�w Unixowych\n"
+#~ "(CUPS oznacza \"Common Unix Printing System\"). Jest to domy�lny system\n"
+#~ "wydruku w Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR to stary system wydruku u�ywany w poprzednich\n"
+#~ "wersjach Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "Je�li nie u�ywasz drukarki, wybierz \"Brak\"."
+
+#~ 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 obs�uguje wiele rodzaj�w drukarek. Ka�da z nich wymaga\n"
+#~ "oddzielnej konfiguracji.\n"
+#~ "\n"
+#~ "\n"
+#~ "Je�li drukarka jest fizycznie pod��czona do Twojego komputera, wybierz\n"
+#~ "\"Drukarka lokalna\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Je�li chcesz uzyska� dost�p do drukarki na innym komputerze z Unixem,\n"
+#~ "wybierz \"Drukarka sieciowa\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Je�li chcesz uzyska� dost�p do drukarki za�o�onej na innym komputerze\n"
+#~ "z Microsoft Windows (lub Unixie z Samb�), wybierz \"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 ""
+#~ "Nale�y teraz w��czy� drukark�, by umo�liwi� instalatorowi jej wykrycie.\n"
+#~ "\n"
+#~ "Konieczne jest te� podanie kilku informacji.\n"
+#~ "\n"
+#~ "\n"
+#~ "...*.Nazwa drukarki: system wydruku wykorzystuje  \"lp\" jako domy�ln� "
+#~ "drukark�, powiniene� posiada� drukark�\n"
+#~ "     o takiej nazwie. Jedna drukarka mo�e mie� wiele nazw, oddzielonych "
+#~ "znakiem '\"'\".\n"
+#~ "     Je�li wi�c lubisz przyjazne nazwy, mo�esz z nich korzysta�:np. "
+#~ "\"Moja drukarka|lp\".\n"
+#~ "    Drukarka, kt�rej jedn� z nazw jest \"lp\" b�dzie drukark� domy�ln�\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Opis drukarki jest opcjonalny, lecz u�yteczny je�li posiadasz wi�cej "
+#~ "drukarek, lub te� udost�pniasz je innym\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Lokalizacja. Je�li chcesz poda� informacje o po�o�eniu drukarki,\n"
+#~ "     wpisz je tutaj (mo�esz wpisa� cokolwiek, np. \"Drugie pi�tro\").\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 ""
+#~ "Nale�y wpisa� tutaj kilka informacji.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Nazwa kolejki: system wydruku wykorzystuje  \"lp\" jako domy�ln� "
+#~ "drukark�, powiniene� posiada� drukark�\n"
+#~ "     o takiej nazwie. Jedna drukarka mo�e mie� wiele nazw, oddzielonych "
+#~ "znakiem '\"'\".\n"
+#~ "     Je�li wi�c lubisz przyjazne nazwy, mo�esz z nich korzysta�:np. "
+#~ "\"Moja drukarka|lp\".\n"
+#~ "    Drukarka, kt�rej jedn� z nazw jest \"lp\" b�dzie drukarka domy�ln�\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * Katalog bufora: jest to katalog, gdzie s� zapisywane drukowane "
+#~ "zadania. Nie zmieniaj domy�lnego wpisu,\n"
+#~ "     je�li nie wiesz, co wpisa�\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Pod��czenie drukarki. Je�li drukarka jest fizycznie pod��czona do "
+#~ "Twojego komputera, wybierz\n"
+#~ "     \"Drukarka lokalna\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Je�li chcesz uzyska� dost�p do drukarki na innym komputerze z "
+#~ "Unixem,\n"
+#~ "     wybierz \"Drukarka sieciowa lpd\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Je�li chcesz uzyska� dost�p do drukarki za�o�onej na innym "
+#~ "komputerze z Microsoft Windows\n"
+#~ "      (lub Unixie z Samb�), wybierz \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "     Je�li chcesz uzyska� dost�p do drukarki w sieci Netware, wybierz "
+#~ "\"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 ""
+#~ "Nie wykryto drukarki. Podaj nazw� portu, do kt�rego jest pod��czona\n"
+#~ "\n"
+#~ "\n"
+#~ "Dla informacji: wi�kszo�� drukarek pod��cza si� do pierwszego portu "
+#~ "r�wnoleg�ego\n"
+#~ "Nazywa si� on w GNU/Linuksie \"/dev/lp0\", natomiast w Windows\"LPT1\""
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Wybierz drukark� z listy powy�ej."
+
+#~ 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 ""
+#~ "Wybierz w�a�ciwe dla swojej drukarki opcje.\n"
+#~ "Je�li nie wiesz, co zaznaczy�, zapoznaj si� z dokumentacj� drukarki\n"
+#~ "\n"
+#~ "\n"
+#~ "W nast�pnym kroku b�dzie mo�liwe sprawdzenie wybranej konfiguracji oraz "
+#~ "jej modyfikacja, je�li wydruki nie b�d� zgodne z oczekiwaniami."
+
+#~ 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 ""
+#~ "Teraz nale�y wpisa� has�o roota Twojego Mandrake Linux.\n"
+#~ "Has�o nale�y wpisa� dwa razy w celu weryfikacji poprawno�ci\n"
+#~ "\n"
+#~ "\n"
+#~ "Root to administrator systemu, jedyny u�ytkownik maj�cy prawo\n"
+#~ "modyfikacji konfiguracji systemu.Zwr�� wi�c szczeg�ln� uwag� na\n"
+#~ "jego has�o! Nieautoryzowane u�ycie konta roota mo�e by� skrajnie\n"
+#~ "niebezpieczne dla integralno�ci systemu i danych oraz innych system�w,\n"
+#~ "pod��czonych do niego.\n"
+#~ "\n"
+#~ "\n"
+#~ "Has�o powinno by� mieszank� znak�w alfanumerycznych\n"
+#~ "o d�ugo�ci co najmniej 8 znak�w. *Nigdy* nie powinno by�\n"
+#~ "zapisywane.\n"
+#~ "\n"
+#~ "Nie wymy�laj jednak has�a zbyt d�ugiego lub nazbyt\n"
+#~ "skomplikowanego: musisz go zapami�ta� bez k�opotu."
+
+#~ 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 ""
+#~ "Je�li w sieci do autentykacji stosowany jest protok� LDAP (lub NIS), "
+#~ "wybierz\n"
+#~ "\"LDAP\" (lub \"NIS\") jako spos�b autentykacji. Je�li nie wiesz, spytaj\n"
+#~ "administratora sieci\n"
+#~ "\n"
+#~ "Jesli komputer nie jset pod��czony do administrowanej sieci, wskazanejest "
+#~ "wybranie \"Pliki lokalne\" jak sposobu autentykacji."
+
+#~ 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 ""
+#~ "Powiniene� utworzy� jedno lub wi�cej kont \"zwyk�ych\" u�ytkownik�w\n"
+#~ "b�d�cych przeciwie�stwem konta \"uprzywilejowanego\" u�ytkownika\n"
+#~ "- roota. Mo�esz utworzy� jedno lub wi�cej kont dla ka�dej osoby, kt�rej\n"
+#~ "chcesz umo�liwi� korzystanie z komputera. Pami�taj, �e ka�de konto ma\n"
+#~ "indywidualne ustawienia (�rodowisko graficzne, ustawienia program�w,"
+#~ "itp.)\n"
+#~ "oraz w�asny \"katalog domowy\", w kt�rych te ustawienia s� zapisywane.\n"
+#~ "\n"
+#~ "\n"
+#~ "Przede wszystkim, utw�rz konto dla samego siebie!. Nawet je�li jeste�\n"
+#~ "jedynym u�ytkownikiem komputera, NIE KORZYSTAJ z konta roota do\n"
+#~ "codziennej pracy: jest to bardzo ryzykowne. Cz�sto zdarza si� \n"
+#~ "zniszczenie systemu przez zwyk�� liter�wk�\n"
+#~ "\n"
+#~ "\n"
+#~ "Powiniene� wi�c do normalnej pracy w systemie korzysta� z konta\n"
+#~ "zwyk�ego u�ytkownika, natomiast konto roota wykorzystywa� tylko\n"
+#~ "do administracji oraz konfiguracji systemu."
+
+#~ 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 ""
+#~ "Utworzenie dysku startowego jest bardzo zalecane. Je�li nie b�dzie\n"
+#~ "mo�na uruchomi� komputera, b�dzie to jedyny prosty spos�b\n"
+#~ "przywr�cenia dzia�ania systemu bez reinstalacji."
+
+#~ 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 ""
+#~ " G��wne opcje LILO i Grub to:\n"
+#~ "  - urz�dzenie startowe:  urz�dzenie, kt�re zawiera sektor �aduj�cy\n"
+#~ "zwykle jest to \"/dev/hda\". Wybierz tak, je�eli nie masz pewno�ci.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Czas op�nienia uruchamiania domy�lnego systemu:\n"
+#~ "okre�la, ile czasu masz do rozpocz�cia uruchamiania domy�lnego systemu.\n"
+#~ "Przydatne bywa w systemach, kt�re s� tak skonfigurowane, �e\n"
+#~ "uruchamianie nast�puje z twardego dysku, natychmiast po uaktywnieniu\n"
+#~ "klawiatury. Program �aduj�cy nie czeka, je�eli op�nienie jest r�wne "
+#~ "zero,\n"
+#~ "lub pominiesz t� opcj�,\n"
+#~ " \n"
+#~ "\n"
+#~ "  - Tryb graficzny: okre�la tryb tekstowy VGA, kt�ry powinien by� "
+#~ "wybrany\n"
+#~ "podczas �adowania. Opcje to:\n"
+#~ "\n"
+#~ "    * normal: wybierz tryb 80x25.\n"
+#~ "\n"
+#~ "    * <numer>: wybierz tryb o danym numerze.  \n"
+#~ "\n"
+#~ "  - Wyczy�� \"/tmp\" po ka�dym prze�adowaniu: je�li chcesz skasowa�\n"
+#~ " wszystkie pliki i katalogi znajduj�ce si� w \"/tmp\" po prze�adowaniu, "
+#~ "zaznacz t� opcj�.  - Okre�l rozmiar pami�ci, je�li trzeba; nie istnieje "
+#~ "niestety standardowa metoda\n"
+#~ "sprawdzania w BIOS-ie ilo�ci pami�ci. W konsekwencji Linux mo�e "
+#~ "nieprawd�owo\n"
+#~ "wykry� wielko�� pami�ci RAM w twoim komputerze. Nale�y pami�ta�, �e "
+#~ "r�nica\n"
+#~ "2 do 4 MB mi�dzy rozmiarem pami�ci wykrytym, a rzeczywistym jest normalna."
+
+#~ 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 to program rozruchowy dla SPARC: pozwala on uruchomi�\n"
+#~ "GNU/Linux lub inny system operacyjny, zainstalowany na twoim komputerze.\n"
+#~ "Normalnie inne systemy s� wykrywane i instalowane. Je�eli tak nie jest,\n"
+#~ "powiniene� \"r�cznie\" wprowadzi� odpowiednie dane. B�d� ostro�ny\n"
+#~ "i wybierz w�a�ciwe parametry.\n"
+#~ "\n"
+#~ " \n"
+#~ "Mo�esz oczywi�cie r�wnie� uniemo�liwi� dost�p do nich przy starcie "
+#~ "przez \n"
+#~ "usuni�cie ich z listy. W tej sytuacji musisz jednak posiada� dyskietki "
+#~ "startowe\n"
+#~ "by je uruchomi�."
+
+#~ 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 ""
+#~ "G��wne opcje SILO to:\n"
+#~ "  - urz�dzenie startowe:  urz�dzenie, kt�re zawiera sektor �aduj�cy\n"
+#~ "     Je�li nie wiesz dok�adnie, co chcesz zrobi�, wybierz     \"Pierwszy "
+#~ "sektor     dysku (MBR)\"\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Czas op�nienia uruchamiania domy�lnego systemu:\n"
+#~ "    okre�la, ile czasu masz do rozpocz�cia uruchamiania domy�lnego "
+#~ "systemu.\n"
+#~ "    To przydaje si� w systemach, kt�re s� tak skonfigurowane, �e     "
+#~ "uruchamianie nast�puje z twardego dysku, natychmiast po w�aczeniu   "
+#~ "klawiatury. Program �aduj�cy nie czeka, je�eli op�nienie jest r�wne "
+#~ "zero,\n"
+#~ "    lub pominiesz t� opcj�."
+
+#~ 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 ""
+#~ "Przyszed� czas na konfiguracj� systemu X Window, kt�ry jest rdzeniem\n"
+#~ "GUI (graficznego interfejsu u�ytkownika) GNU/Linuxa. W tym celu trzeba\n"
+#~ "skonfigurowa� kart� graficzn� oraz monitor. Wi�kszo�� krok�w jest\n"
+#~ "zautomatyzowana, tak wi�c Twoje zadanie polega na weryfikacji tego,\n"
+#~ "co zosta�o zrobione oraz akceptowaniu ustawie� :)\n"
+#~ "\n"
+#~ "\n"
+#~ "Kiedy konfiguracja zostanie zako�czona, X-y zostan� uruchomione\n"
+#~ "(o ile tego chcesz), by� mo�na by�o sprawdzi�, czy ustawienia s� "
+#~ "odpowiednie\n"
+#~ "Je�li nie s� w�a�ciwe, mo�esz si� cofn�� i zmieni� je, tak wiele\n"
+#~ "razy jak jest to potrzebne."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Je�eli z konfiguracj� X-�w jest co� nie tak, u�yj tych opcji,\n"
+#~ "w celu poprawnego skonfigurowania X Window System."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Je�eli chcesz u�ywa� graficznego trybu przy logowaniu si� w systemie \n"
+#~ "wybierz \"Tak\". W przeciwnym wypadku wybierz \"Nie\"."
+
+#~ 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 ""
+#~ "Mo�esz okre�li� poziom bezpiecze�stwa systemu. Szczeg�owe informacje na "
+#~ "ten temat znajduj� si� w podr�czniku.\n"
+#~ "Je�li nie wiesz co wybra�, zachowaj domy�lne ustawienia.\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 ""
+#~ "Teraz nast�pi ponowne uruchomienie systemu.\n"
+#~ "\n"
+#~ "Tw�j nowy Mandrake Linux zostanie za�adowany automatycznie.\n"
+#~ "Je�eli chcia�by� za�adowa� inny z posiadanych system�w operacyjnych,\n"
+#~ "przeczytaj dodatkowe instrukcje."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "czeski (programisty)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "s�owacki (programisty)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Nazwa tworzonego profilu:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Zapisz /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Przywr�� z pliku"
+
+#~ msgid "Save in file"
+#~ msgstr "Zapisz do pliku"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Przywr�� z dyskietki"
+
+#~ msgid "Format all"
+#~ msgstr "Sformatuj wszystko"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Po sformatowaniu wszystkich partycji,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "wszystkie dane znajduj�ce si� na nich zostan� utracone"
+
+#~ msgid "Reload"
+#~ msgstr "Prze�aduj"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "Czy utworzy� dyskietk� instalacji automatycznej w celu powielenia "
+#~ "instalacji?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "Konfiguracja 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 ""
+#~ "Korzystaj�c z sieciowego serwera CUPS nie musisz tutaj\n"
+#~ "konfigurowa� �adnych drukarek; zostan� one automatycznie\n"
+#~ "wykryte, chyba �e znajduje si� on w innej sieci, w tym przypadku\n"
+#~ "nale�y poda� adres serwera CUPS oraz opcjonalnie numer portu."
+
+#~ msgid "Enter Printer Name and Comments"
+#~ msgstr "Podaj nazw� drukarki i komentarz"
+
+#~ msgid "Remote queue name missing!"
+#~ msgstr " Kolejka sieciowa"
+
+#~ msgid "Pipe into command"
+#~ msgstr "Potok do polecenia"
+
+#~ msgid ""
+#~ "Here you can specify any arbitrary command line into which the job should "
+#~ "be piped instead of being sent directly to a printer."
+#~ msgstr ""
+#~ "Tutaj mo�na poda� dowolne polecenie, kt�re zostanie wykonane w "
+#~ "potokuzamiast bezpo�redniego wys�ania wydruku do drukarki"
+
+#~ msgid "Command line"
+#~ msgstr "Polecenie"
+
+#~ msgid "A command line must be entered!"
+#~ msgstr "Nale�y wpisa� polecenie!"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Monitorowanie sieci"
+
+#~ msgid "Settings"
+#~ msgstr "Ustawienia"
+
+#~ msgid "Profile "
+#~ msgstr "Profil "
+
+#~ msgid "Statistics"
+#~ msgstr "Statystyki"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "Szybko�� wysy�ania: "
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "Szybko�� odbierania: "
+
+#~ msgid "Connection Time: "
+#~ msgstr "Czas po��czenia:"
+
+#~ msgid "Logs"
+#~ msgstr "Logi"
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Po��czenie z Internetem"
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Roz��cz po��czenie z Internetem"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Roz��czenie po��czenia powiod�o si�."
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Roz��czono."
+
+#~ msgid "Connection complete."
+#~ msgstr "Po��czono."
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "Po��czenie nie powiod�o si�. Sprawd� konfiguracj� w w Centrum Sterownia "
+#~ "Mandrake."
+
+#~ msgid "Color configuration"
+#~ msgstr "Konfiguracja kolor�w"
+
+#~ msgid "sent: "
+#~ msgstr "wys�ano: "
+
+#~ msgid "received: "
+#~ msgstr "odebrano: "
+
+#~ msgid "average"
+#~ msgstr "�rednio"
+
+#~ msgid "Connect"
+#~ msgstr "Po��cz"
+
+#~ msgid "Disconnect"
+#~ msgstr "Roz��cz"
+
+#~ msgid "/File/_New"
+#~ msgstr "/Plik/_Nowy"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Plik/_Otw�rz"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Plik/Zapi_sz"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Plik/Z_apisz jako"
+
+#~ msgid "/File/-"
+#~ msgstr "/Plik/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Opcje"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Opcje/Test"
+
+#~ msgid "/_Help"
+#~ msgstr "/Pomo_c"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Pomoc/O _programie"
+
+#~ msgid "Default Runlevel"
+#~ msgstr "Domy�lny tryb uruchamiania"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Usu� kolejk�"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Zawarto�� pliku konfiguracyjnego nie mo�e zosta� zinterpretowana."
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Niepoprawny plik konfiguracyjny"
+
+#~ msgid "Adapter"
+#~ msgstr "Karta"
+
+#~ msgid "Disable network"
+#~ msgstr "Wy��czenie sieci"
+
+#~ msgid "Enable network"
+#~ msgstr "W��czenie sieci"
+
+#~ 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 ""
+#~ "Mo�na teraz przetestowa� mysz. U�yj przycisk�w i k�ka by sprawdzi�,\n"
+#~ "czy ustawienia s� w�a�ciwe. Je�li nie, wybierz \"Anuluj\" by wybra� inny\n"
+#~ "sterownik."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "Po��czenie DSL (lub ADSL)"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Zamknij"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "Mo�na bezpo�rednio poda� URI okre�laj�ce dost�p do drukarki w CUPS"
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Tak, wydrukuj stron� testow� ascii"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Tak, wydrukuj graficzn� stron� testow�"
+
+#~ msgid "Yes, print both test pages"
+#~ msgstr "Tak, wydrukuj obie strony testowe"
+
+#~ msgid "Paper Size"
+#~ msgstr "Rozmiar papieru"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Wysun�� stron� po wydruku?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Opcje sterownika uniprint"
+
+#~ msgid "Color depth options"
+#~ msgstr "Opcje g��bi kolor�w"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Drukowa� tekst jako PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Usun�� efekt schodk�w?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Ilo�� stron na stronie wydruku"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Lewy/Prawy margines w punktach (1/72 cala) "
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "G�rny/Dolny margines w punktach (1/72 cala)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Dodatkowe opcje GhostScriptu"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Dodatkowe opcje dla tekstu"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Odwrotna kolejno�� stron"
+
+#~ msgid "CUPS starting"
+#~ msgstr "Uruchamianie CUPS"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Wybierz spos�b pod��czenia drukarki sieciowej"
+
+#~ 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 ""
+#~ "Przy korzystaniu z sieciowego serwera CUPS, drukarki\n"
+#~ "zostan� automatycznie wykryte, nie ma potrzeby ich konfiguracji.\n"
+#~ "W przypadku w�tpliwo�ci, wybierz \"Sieciowy serwer CUPS\"."
+
+#~ 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 ""
+#~ "Ka�da drukarka wymaga nazwania (na przyk�ad lp)\n"
+#~ "Mo�na te� zdefiniowa� inne parametry jak opis drukarki lub jej "
+#~ "lokalizacj�\n"
+#~ "Jak� nazw� u�y� dla tej drukarki oraz w jaki spos�b jest ona pod��czona?"
+
+#~ 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 ""
+#~ "Ka�da kolejka drukarki (drukuje zadanie skierowane do niej)\n"
+#~ "wymaga nazwania (cz�sto lp) oraz przypisania katalogu na bufor.\n"
+#~ "Jak nazwa� katalog przypisany do kolejki oraz jak drukarka jest "
+#~ "pod��czona?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Nazwa kolejki:"
+
+#~ msgid "Spool directory"
+#~ msgstr "Katalog bufora:"
+
+#~ msgid "Disable"
+#~ msgstr "Wy��czy�"
+
+#~ msgid "Enable"
+#~ msgstr "W��czy�"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "By zwi�kszy� poziom bezpiecze�stwa systemu nale�y w��czy�:\n"
+#~ "\"U�yj pliku shadow\" i \"U�yj d�ugich hase� MD5\" "
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Je�eli Twoja sie� u�ywa NIS (systemu informacji sieciowej),\n"
+#~ "wybierz \"U�yj NIS\". \n"
+#~ "Je�eli nie jeste� pewien, spytaj administratora sieci."
+
+#~ msgid "yellow pages"
+#~ msgstr "��te strony"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "Konfiguracja sieci lokalnej"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "DNS 1 dostawcy"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "DNS 2 dostawcy"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Jak chcesz ��czy� si� Internetem?"
 
 #~ msgid "cannot fork: "
 #~ msgstr "cannot fork: "
@@ -8312,9 +10204,6 @@ msgstr "Zestawy narz�dzi dla poczty, WWW, transferu plik�w i chat"
 #~ msgid "This startup script try to load your modules for your usb mouse."
 #~ msgstr "Ten skrypt startowy �aduje modu� obs�uguj�cy mysz usb."
 
-#~ msgid "Configuration de Lilo/Grub"
-#~ msgstr "Konfiguracja Lilo/Grub"
-
 #~ msgid "Boot style configuration"
 #~ msgstr "Konfiguracja sposobu uruchamiania"
 
@@ -8500,9 +10389,6 @@ msgstr "Zestawy narz�dzi dla poczty, WWW, transferu plik�w i chat"
 #~ msgid "loopback"
 #~ msgstr "plikopartycja"
 
-#~ msgid "None"
-#~ msgstr "�aden"
-
 #~ msgid "Which bootloader(s) do you want to use?"
 #~ msgstr "Kt�rego programu rozruchowego chcesz u�y�?"
 
@@ -8518,9 +10404,6 @@ msgstr "Zestawy narz�dzi dla poczty, WWW, transferu plik�w i chat"
 #~ msgid "Configure local network"
 #~ msgstr "Konfiguracja sieci lokalnej"
 
-#~ msgid "Disable networking"
-#~ msgstr "Wy��czenie sieci"
-
 #~ msgid "Configure the Internet connection / Configure local Network"
 #~ msgstr "Konfiguracja po��czenia z Internetem / Konfiguracja sieci lokalnej"
 
@@ -8671,9 +10554,6 @@ msgstr "Zestawy narz�dzi dla poczty, WWW, transferu plik�w i chat"
 #~ msgid "Toggle between Installed and Available"
 #~ msgstr "Prze��cze mi�dzy zainstalowanymi i dost�pnymi"
 
-#~ msgid "Uninstall"
-#~ msgstr "Odinstaluj"
-
 #~ msgid "Choose package to install"
 #~ msgstr "Wybierz pakiety do zainstalowania"
 
diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po
index c2979dacf..6db9fe781 100644
--- a/perl-install/share/po/pt.po
+++ b/perl-install/share/po/pt.po
@@ -6,33 +6,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: 2001-03-16 22:02GMT\n"
-"Last-Translator: Jorge Costa <Jorgercosta@netc.pt>\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-03-10 19:37GMT\n"
+"Last-Translator: Jorge Costa <jorgercosta@netc.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.8\n"
+"X-Generator: KBabel 0.9.2\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
-msgstr "Configurar cabe�as independentemente"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
+msgstr "Configurar todas as cabe�as independentemente"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Usar exten��o Xinerama"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Configurar placa �nica \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Configura��o Multi-Cabe�a"
 
-#: ../../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 ""
 "O seu sistema suporta configura��o multi-cabe�a.\n"
 "O que deseja afazer?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Placa Gr�fica"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Seleccione uma placa gr�fica"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Escolha um 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 "Qual a configura��o do Servidor X que deseja ter?"
 
-#: ../../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 ""
 "XFree%s.\n"
 "A sua placa � suportada pelo XFree %s que pode ter um melhor suporte para 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 ""
 "A sua placa pode ter suporte para acelera��o 3D por hardware com o 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 com acelera��o 3D por hardware"
 
-#: ../../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 ""
 "A sua placa pode ter suporte para acelera��o 3D por hardware com o XFree%s,\n"
 "ATEN��O ESTE SUPORTE � EXPERIMENTAL E PODE CONGELAR O SEU COMPUTADOR."
 
-#: ../../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 com acelera��o 3D por hardware 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"
@@ -112,27 +113,31 @@ msgstr ""
 "ATEN��O ESTE SUPORTE � EXPERIMENTAL E PODE CONGELAR O SEU COMPUTADOR.A sua "
 "placa � suportada pelo XFree %s que pode ter um melhor suporte para 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "Configura��o do XFree"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Seleccione o tamanho da mem�ria da sua placa gr�fica"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Escolha as op��es para o servidor"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Escolha um 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"
@@ -154,39 +159,39 @@ msgstr ""
 "para al�m das capacidades do seu monitor: pode danificar seu monitor.\n"
 " Se tiver d�vidas, escolha defini��es conservadoras."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Taxa de refrescamento horizontal"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Taxa de refrescamento vertical"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Monitor n�o configurado"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Placa gr�fica ainda n�o configurada"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Resolu��es ainda n�o escolhidas"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Quer testar a configura��o?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Aviso: o teste desta placa gr�fica pode congelar o seu computador"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Teste da configura��o"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -194,152 +199,156 @@ msgstr ""
 "\n"
 "tente alterar alguns par�metros"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Ocorreu um erro:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "A sair em %d segundos"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Esta � a defini��o correcta?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Ocorreu um erro, tente alterar alguns par�metros"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Resolu��o"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Escolha a resolu��o e a profundidade de cor"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Placa Gr�fica: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Server 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 "Modo de Perito"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Mostrar tudo"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Resolu��es"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tipo de teclado: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo de Rato: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Dispositivo Rato: %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 "Sincroniza��o Horizontal do Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Refrescamento Vertical do Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Placa Gr�fica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Placa 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 "Profundidade de cor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolu��o: %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 "Driver XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "A preparar a configura��o X-Window"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "O que deseja fazer?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Alterar Monitor"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Alterar Placa Gr�fica"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Alterar op��es do Servidor"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Alterar Resolu��o"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Mostrar informa��o"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Testar de novo"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Sair"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -352,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 "Por favor volte a entrar no %s para activar a altera��es"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Por favor sa�a e depois utilize Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X ao iniciar"
 
-#: ../../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,214 +428,222 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB ou mais"
+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 ou mais"
+
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA Padr�o, 640x480 a 60 Hz Padr�o"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 a 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "Compat�vel com 8514, 1024x768 a 87 Hz entrela�ado (sem 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 entrela�ado, 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 Alargado, 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 N�o-entrela�ado, 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 de Alta Frequ�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-frequ�ncia que consegue 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-frequ�ncia que consegue 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-frequ�ncia que consegue 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 consegue1600x1200 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 consegue1600x1200 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 "Primeiro sector da parti��o de arranque"
 
-#: ../../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 "Primeiro sector do disco (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "Instala��o do 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 "Onde quer instalar o carregador de arranque?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "Instala��o do 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 com menu em texto"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO com menu gr�fico"
 
-#: ../../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 "Arrancar do 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 "Principais op��es do carregador de arranque"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Carregador de arranque deve usar"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Instala��o do carregador de arranque"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Dispositivo de arranque"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (n�o funciona com BIOS antigas)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Compacto"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "compacto"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Modo de V�deo"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Tempo de espera antes de arrancar na imagem padr�o"
 
-#: ../../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 "Senha"
 
-#: ../../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 "Senha (de novo)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Restringir op��es da linha de comando"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "restringir"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Limpar /tmp a cada arranque"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Tamanho da RAM preciso se necess�rio (%d MB encontrados)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Activar multi-perfis"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Indicar o tamanho da RAM em Mb"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "Op��o ``Restringir op��es da linha de comando'' n�o tem uso sem senha"
 
-#: ../../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 "Por favor tente novamente"
 
-#: ../../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 "As senhas n�o coincidem"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Mensagem Init"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Abrir tempo de espera de Firmware"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Tempo limite de Arranque do Kernel"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Activar Arranque de CD?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Activar de Arranque?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "SO por omiss�o?"
 
-#: ../../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."
@@ -634,146 +651,144 @@ msgstr ""
 "Aqui est�o a diferentes entradas.\n"
 "Pode adicionar mais ou alterar as existentes"
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../../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 "Pronto"
 
-#: ../../any.pm_.c:220
-#, fuzzy
+#: ../../any.pm_.c:217
 msgid "Modify"
-msgstr "Modificar RAID"
+msgstr "Modificar"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Qual tipo de entrada que quer adicionar?"
 
-#: ../../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 "Outros SO (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Outros SO (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Outros SO (windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Imagem"
 
-#: ../../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 "Adicionar"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Leitura-Escrita"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tabela"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Inseguro"
 
-#: ../../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 "R�tulo"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Por omiss�o"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Tamanho-Initrd"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "SemV�deo"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Remover entrada"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "N�o � permitido um r�tulo vazio"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Este r�tulo j� est� a ser utilizado"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Que tipo de particionamento?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Interfaces %s %s encontrados"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Tem algum outro?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Tem algum interface %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 "N�o"
 
-#: ../../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 "Sim"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Ver informa��o do hardware"
 
 #. -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 "A instalar o driver para %s placa %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(m�dulo %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 "Qual driver %s que eu deveria tentar?"
 
-#: ../../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 +805,20 @@ msgstr ""
 "m�quina as informa��es que ele precisa? Ocasionalmente, isso poder�\n"
 "travar o computador, mas n�o deve causar algum dano."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Auto-procurar"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Especificar op��es"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Agora pode indicar as op��es para o m�dulo %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -814,11 +829,11 @@ msgstr ""
 "As op��es est�o no formato ``nome=valor nome2=valor2 ...''\n"
 "Para exemplo, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Op��es do m�dulo:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -827,34 +842,34 @@ msgstr ""
 "O carregamento do m�dulo %s falhou.\n"
 "Quer tentar novamente com outros par�metros?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(j� adicionado %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Essa senha � demasiado simples"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Por favor indique um nome de utilizador"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "O nome de utilizador deve conter apenas letras min�sculas, n�meros, `-' e `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Este nome de utilizador j� foi adicionado"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Adicionar utilizador"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -863,54 +878,67 @@ msgstr ""
 "Introduza um utilizador\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Aceitar utilizador"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Nome 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 "Nome de utilizador"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "�cone"
 
-#: ../../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 ""
-"Pode configurar o seu computador para automaticamente iniciar com um "
-"utilizador.\n"
-"Se n�o n�o quer esta capacidade, prima o bot�o cancelar."
+"Eu posso configurar o computador para iniciar automaticamente o X ap�s o "
+"arranque.\n"
+"Gostaria de iniciar o X quando voltar a arrancar?"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Escolha o utilizador por omiss�o :"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Escolha o gestor de janelas a correr:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Por favor escolha o idioma a ser utilizado."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "Pode escolher outros idiomas que estar�o dispon�veis ap�s a instala��o"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Tudo"
+
 # 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"
@@ -927,52 +955,57 @@ 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 "Bem-Vindo ao GRUB o seleccionador de Sistema Operativo!"
 
 #. -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 a tecla %c e %c  para escolher qual a entrada seleccionada."
 
 #. -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 "Prima 'enter' para arrancar o SO seleccionado, 'e' para editar os"
 
 #. -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 "comandos antes de arrancar, ou 'c' para linha de comando."
 
 #. -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 ""
 "A op��o seleccionada vai arrancar automaticamente dentro de %d segundos."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "n�o h� espa�o suficiente em /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 "Ambiente de trabalho"
 
 #. -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 "Menu Iniciar"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Onde quer instalar o carregador de arranque?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "nenhuma ajuda implementada ainda.\n"
@@ -985,528 +1018,702 @@ msgstr "Configura��o do Estilo de Arranque"
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Ficheiro/_Novo"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Ficheiro/_Abrir"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>A"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Ficheiro/_Guardar"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>G"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Ficheiro/Guardar _Como"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Ficheiro/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Ficheiro/_Sair"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>S"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Op��es"
+#: ../../bootlook.pm_.c:91
+msgid "NewStyle Categorizing Monitor"
+msgstr "Monitor de Categoriza��o NewStyle"
 
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Op��es/Teste"
+#: ../../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/_Acerca de..."
+#: ../../bootlook.pm_.c:94
+msgid "Traditional Gtk+ Monitor"
+msgstr "Monitor Tradicional Gtk+"
 
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Configurar"
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
+msgstr "Iniciar Aurora no arranque"
 
-#: ../../bootlook.pm_.c:114
-#, fuzzy, c-format
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Modo lilo/grub"
+
+#: ../../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 ""
-"Bem-Vindo ao utilit�rio de Partilha da Liga��o � Internet!\n"
-"\n"
-"%s\n"
-"\n"
-"Clique em ``Ok'' se quer executar o Assistente de Configura��o."
-
-#: ../../bootlook.pm_.c:121
-#, fuzzy
-msgid "Lilo/grub mode"
-msgstr "Modo de marca��o"
-
-#: ../../bootlook.pm_.c:131
-msgid "NewStyle Categorizing Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:134
-#, fuzzy
-msgid "NewStyle Monitor"
-msgstr "Monitor"
+"Est� correntemente a usar %s como Gestor de Arranque.\n"
+"Clique em Configurar para iniciar o assistente de configura��o."
 
-#: ../../bootlook.pm_.c:137
-#, fuzzy
-msgid "Traditional Monitor"
-msgstr "Alterar Monitor"
-
-#: ../../bootlook.pm_.c:140
-msgid "Traditional Gtk+ Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:144
-msgid "Launch Aurora at boot time"
-msgstr "Executar Aurora no arranque"
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Configurar"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Modo de arranque"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Modo do sistema"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
-msgstr "Executar o X-Window na inicializa��o"
+msgstr "Iniciar o X-Window na inicializa��o"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "N�o, eu n�o quero autologin"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Sim, eu quero autologin com este (utilizador, ambiente de trabalho)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Modo do sistema"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Por omiss�o"
-
-#: ../../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 "Cancelar"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "n�o poss�vel abrir /etc/inittab para leitura: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "n�o poss�vel abrir /etc/sysconfig/autologin para leitura: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "n�o poss�vel abrir /etc/inittab para leitura: %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 "A Instala��o do LILO falhou. Ocorreram os seguintes erros:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Criar"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Desmontar"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Eliminar"
-
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatar"
+#: ../../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 "Redimensionar"
+#: ../../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 minutos"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Ponto de Montagem"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minuto"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Escrever /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d segundos"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Alternar para modo perito"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Por favor fa�a primeiro uma c�pia de seguran�a dos seus dados"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Alternar para modo normal"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Leia com aten��o!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Restaurar do ficheiro"
+#: ../../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 planear usar aboot, lembre-se de deixar espa�o livre (2048 sectores � "
+"suficiente)\n"
+"no in�cio do disco"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Guardar no ficheiro"
+#: ../../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 "Erro"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Assistente"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Restaurar da disquete"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Novo"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Guardar em disquete"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Fila remota"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Limpar tudo"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Ponto de Montagem"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Formatar tudo"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Op��es"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Auto alocar"
+#: ../../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 "Todas as parti��es prim�rias est�o usadas"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Desmontar"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Eu n�o posso adicionar mais nenhuma parti��o"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Montar"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Escolher ac��o"
 
-#: ../../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 ""
-"Para ter mais parti��es, por favor elimine uma para poder criar uma parti��o "
-"extendida"
+"Tem uma parti��o FAT grande \n"
+"(normalmente utilizada pelo MicroSoft Dos/Windows.)\n"
+"Sugiro que redimensione primeiro a parti��o\n"
+"(clique nela, depois clique em \"Redimensionar\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Sem espa�o livre suficiente para auto-aloca��o"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Por favor clique numa parti��o"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Anular"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Por favor clique numa parti��o"
+
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Por favor clique numa parti��o"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Escrever a tabela de parti��es"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Mais"
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detalhes"
 
-#: ../../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 "falhou ao montar"
+
+#: ../../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 "Vazio"
 
-#: ../../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 "Outro"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Tipos de sistema de ficheiros:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detalhes"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Criar"
+
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Use ``%s'' ao inv�s"
+
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Use ``Desmontar'' primeiro"
 
-#: ../../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 ""
-"Tem uma parti��o FAT grande \n"
-"(normalmente utilizada pelo MicroSoft Dos/Windows.)\n"
-"Sugiro que redimensione primeiro a parti��o\n"
-"(clique nela, depois clique em \"Redimensionar\")"
+"Ap�s alterar o tipo de parti��o %s, todos os dados desta parti��o ser�o "
+"perdidos"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Por favor fa�a primeiro uma c�pia de seguran�a dos seus dados"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Onde deseja montar o dispositivo %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 "Leia com aten��o!"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Op��es do m�dulo:"
 
-#: ../../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 planear usar aboot, lembre-se de deixar espa�o livre (2048 sectores � "
-"suficiente)\n"
-"no in�cio do disco"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Tenha cuidado: essa opera��o � perigosa."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "Automontagem de M�dias Amov�veis"
 
-#: ../../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 "Erro"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Alterar tipo de parti��o"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Ponto de montagem: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Que sistema de ficheiros deseja?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Dispositivo: "
+#: ../../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 "Letra do drive no DOS: %s (apenas um palpite)\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 "Tipo: "
+#: ../../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 "Nome: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Servidor"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Inicial: 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 "Tamanho: %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 sectores"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Cilindro %d ao cilindro %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Escolher ac��o"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Formatado\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Criar uma nova parti��o"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "N�o formatado\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Montado\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Alternar para modo perito"
 
-#: ../../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 "Alternar para modo normal"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Ficheiro(s) loopback: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Anular"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Parti��o de arranque por omiss�o\n"
-"    (para arranque do MS-DOS, n�o para o lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Continuar mesmo assim?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "N�vel %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Sair sem guardar"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Tamanho do bloco %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Sair sem gravar na tabela de parti��o?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "Discos RAID %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Quer testar a configura��o?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Nome do ficheiro loopback: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Auto alocar"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Limpar tudo"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Mais"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Detec��o de discos r�gidos"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Sem espa�o livre suficiente para auto-aloca��o"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Todas as parti��es prim�rias est�o usadas"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Eu n�o posso adicionar mais nenhuma parti��o"
+
+#: ../../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"
-"� prov�vel que esta parti��o seja\n"
-"uma parti��o Driver, n�o lhe\n"
-"deve mexer.\n"
+"Para ter mais parti��es, por favor elimine uma para poder criar uma parti��o "
+"extendida"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Alterar tipo de parti��o"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Tentando resgatar tabela de parti��es"
+
+#: ../../diskdrake_interactive.pm_.c:287
+#, fuzzy
+msgid "Rescue partition table"
+msgstr "Tentando resgatar tabela de parti��es"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Alterar tipo de parti��o"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Automontagem de M�dias Amov�veis"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Seleccione ficheiro"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../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"
-"Esta � uma parti��o especial\n"
-" Bootstrap serve para o \n"
-"duplo arranque do seu sistema.\n"
+"A tabela de parti��es de seguran�a n�o tem o \n"
+"mesmo tamanho. Continuar mesmo assim?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Por favor clique numa parti��o"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Aviso"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Tamanho: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Insira uma disquete no drive\n"
+"Todos os dados na disquete ser�o perdidos"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometria: %s cilindros, %s cabe�as, %s sectores\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Tentando resgatar tabela de parti��es"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "Discos LVM %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Mostrar informa��o"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Tipo da tabela de parti��es: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Redimensionar"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "no barramento %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Mover"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Montar"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatar"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Activo"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Adicionar ao RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Remover do RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Modificar RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Adicionar ao LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Remover do RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Remover do LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Modificar RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Usar para loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Escolher ac��o"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Criar uma nova parti��o"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Sector inicial: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Tamanho em MB: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Tipo do Sistema de Ficheiros: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Ponto de montagem: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Prefer�ncia: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "A formatar o ficheiro loopback %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Alterar tipo de parti��o"
+
+#: ../../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 "Onde deseja montar o ficheiro loopback %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 ""
+"N�o posso remover a defini��o do ponto de montagem enquanto \n"
+"a parti��o for usada para loopback. Remova o loopback primeiro"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "A computar limites do sistema de ficheiros FAT"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "A redimensionar"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Esta parti��o n�o � redimension�vel"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Deveria fazer uma c�pia de seguran�a de todos os dados nesta parti��o"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"Ap�s redimensionar a parti��o %s, todos os dados da parti��o ser�o perdidos"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Escolha o novo tamanho"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Tamanho em MB: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Para qual disco quer mover?"
+
+#: ../../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 "Para qual sector quer mover?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "A mover"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "A mover parti��o..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Escolha um RAID existente para adicionar a"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "novo"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Escolha um LVM existente para adicionar a"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "Nome do LVM?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Essa parti��o n�o pode ser usada para loopback"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Nome do ficheiro loopback: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Nome real"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "O ficheiro j� � utilizado por outro loopback, escolha outro"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "O ficheiro j� existe. Utiliz�-lo?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "dispositivo"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "n�vel"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "tamanho do bloco"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Tenha cuidado: essa opera��o � perigosa."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Que tipo de particionamento?"
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1518,7 +1725,7 @@ msgstr ""
 "Ou usa o LILO e ele n�o funcionar�, ou voc� n�o usa o LILO e n�o precisar� "
 "de /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"
@@ -1531,7 +1738,7 @@ msgstr ""
 "Se quer usar o gestor de arranque LILO, tenha cuidado em adicionar uma "
 "parti��o /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"
@@ -1541,282 +1748,241 @@ msgstr ""
 "Nenhum gestor de arranque n�o consegue aced�-lo sem uma\n"
 "parti��o /boot. Tenha o cuidado de adicionar uma parti��o /boot"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Use ``%s'' ao inv�s"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Use ``Desmontar'' primeiro"
-
-#: ../../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 ""
-"Ap�s alterar o tipo de parti��o %s, todos os dados desta parti��o ser�o "
-"perdidos"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Continuar mesmo assim?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Sair sem guardar"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Sair sem gravar na tabela de parti��o?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Alterar tipo de parti��o"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Que sistema de ficheiros deseja?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "N�o pode usar ReiserFS em parti��es menores que 32MB"
-
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Onde deseja montar o ficheiro loopback %s?"
-
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Onde deseja montar o dispositivo %s?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "A tabela de parti��es do drive %s vai ser escrita no disco!"
 
-#: ../../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�o posso remover a defini��o do ponto de montagem enquanto \n"
-"a parti��o for usada para loopback. Remova o loopback primeiro"
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Precisar� re-arrancar antes que as modifica��es tenham efeito"
 
-#: ../../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 ""
 "Ap�s formatar a parti��o %s, todos os dados desta parti��o ser�o perdidos"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "A formatar"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "A formatar o ficheiro 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 "A formatar a parti��o %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Ap�s formatar todas as parti��es,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "todos os dados nessas parti��es ser�o perdidos"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Mover"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Para qual disco quer mover?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sector"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid falhou"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Para qual sector quer mover?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Sem espa�o livre suficiente para alocar as novas parti��es"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "A mover"
+#: ../../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 "A mover parti��o..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Sem espa�o livre suficiente para alocar as novas parti��es"
 
-#: ../../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 "A tabela de parti��es do drive %s vai ser escrita no disco!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Precisar� re-arrancar antes que as modifica��es tenham efeito"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Resolu��o: %s\n"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "A computar limites do sistema de ficheiros FAT"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Dispositivo: "
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "A redimensionar"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "Letra do drive no DOS: %s (apenas um palpite)\n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Esta parti��o n�o � redimension�vel"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Tipo: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Deveria fazer uma c�pia de seguran�a de todos os dados nesta parti��o"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Nome: "
 
-#: ../../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 ""
-"Ap�s redimensionar a parti��o %s, todos os dados da parti��o ser�o perdidos"
+msgid "Start: sector %s\n"
+msgstr "Inicial: sector: %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Escolha o novo tamanho"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Tamanho: %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 sectores"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Criar uma nova parti��o"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Cilindro %d ao cilindro %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Sector inicial: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Formatado\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Tamanho em MB: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "N�o formatado\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Tipo do Sistema de Ficheiros: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Montado\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 "Essa parti��o n�o pode ser usada para loopback"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Ficheiro(s) 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 ""
+"Parti��o de arranque por omiss�o\n"
+"    (para arranque do MS-DOS, n�o para o lilo)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Nome do ficheiro loopback: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "N�vel %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "O ficheiro j� � utilizado por outro loopback, escolha outro"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Tamanho do bloco %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "O ficheiro j� existe. Utiliz�-lo?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "Discos RAID %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Seleccione ficheiro"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Nome do ficheiro 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 ""
-"A tabela de parti��es de seguran�a n�o tem o \n"
-"mesmo tamanho. Continuar mesmo assim?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Aviso"
+"\n"
+"� prov�vel que esta parti��o seja\n"
+"uma parti��o Driver, n�o lhe\n"
+"deve mexer.\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 ""
-"Insira uma disquete no drive\n"
-"Todos os dados na disquete ser�o perdidos"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Tentando resgatar tabela de parti��es"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "dispositivo"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "n�vel"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "tamanho do bloco"
+"\n"
+"Esta � uma parti��o especial\n"
+" Bootstrap serve para o \n"
+"duplo arranque do seu sistema.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Escolha um RAID existente para adicionar a"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Tamanho: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "novo"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometria: %s cilindros, %s cabe�as, %s sectores\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Escolha um LVM existente para adicionar a"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Informa��o: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "Nome do LVM?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "Discos 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 "Tipo da tabela de parti��es: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Recuperar tabela de parti��es"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "no barramento %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Recarregar"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Op��es: %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 formata��o de %s falhou"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "N�o sei como formatar %s no tipo %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "falhou ao montar"
+
+#: ../../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 "falhou ao montar: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "erro a desmontar %s: %s"
@@ -1829,41 +1995,44 @@ msgstr "simples"
 msgid "server"
 msgstr "servidor"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "N�o pode usar JFS em parti��es menores que 16MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "N�o pode usar ReiserFS em parti��es menores que 32MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Pontos de montagem devem come�ar com uma /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "J� existe uma parti��o no ponto de montagem %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Montagens circulares %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 "N�o pode usar LVM Logical Volume para o ponto de montagem %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Esta directoria deveria permanecer dentro do sistema de ficheiros root"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Precisa de um verdadeiro sistema de ficheiros (ext2, reiserfs) para este "
 "ponto de montagem\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Erro ao abrir %s para escrita: %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"
@@ -1871,1542 +2040,1002 @@ msgstr ""
 "Ocorreu um erro - nenhum dispositivo v�lido foi encontrado para criar novos "
 "sistemas de ficheiros. Por favor verifique no hardware a causa deste problema"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "N�o tem parti��es!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr ""
-"Por favor escolha o seu idioma preferido para a instala��o e utiliza��o do "
-"sistema."
-
-#: ../../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"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
-msgstr ""
-"Precisa de aceitar os termos da licen�a acima para continuar a instala��o.\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"
-"Por favor clique em \"Aceitar\" se concordar com ela.\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"\n"
-"Por favor clique em \"Recusar\" se n�o concorda com ela. A instala��o ser� "
-"cancelada sem modificar a sua configura��o\n"
-"actual."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Escolha o teclado correspondente ao seu na lista acima"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
+msgstr ""
 
-#: ../../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 ""
-"Se desejar, outros idiomas (al�m do que escolheu\n"
-"no in�cio da instala��o) estar�o dispon�veis ap�s a instala��o, por favor "
-"escolha-os\n"
-"na lista acima. Se os quiser todos, precisa apenas seleccionar \"Todos\"."
 
-#: ../../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 ""
-"Por favor escolha \"Instalar\" caso n�o exista nenhuma vers�o anterior do "
-"Linux-Mandrake\n"
-"instalado ou se deseja utilizar v�rios sistemas operativos.\n"
-"\n"
-"\n"
-"Por favor escolha \"Actualizar\" se desejar actualizar uma vers�o instalada "
-"do Linux-Mandrake.\n"
-"\n"
-"\n"
-"Dependendo do seu conhecimento sobre GNU/Linux, voc� pode escolher um dos "
-"seguintes n�veis para instalar\n"
-"ou actualizar o seu Linux-Mandrake:\n"
-"\n"
-"\t* Recomendado: se nunca instalou um sistema GNU/Linux escolha esse. A "
-"instala��o ser� \n"
-"\t  f�cil e ser�o feitas apenas algumas perguntas.\n"
-"\n"
-"\n"
-"\t* Personalizado: se estiver familiarizado com o GNU/Linux, pode escolher o "
-"uso prim�rio (esta��o, \n"
-"\t  servidor, desenvolvimento) do seu sistema. Responder� a mais perguntas "
-"do que na classe de instala��o\n"
-"\t  \"Recomendada\", precisa ent�o de saber com o GNU/Linux funciona para "
-"poder escolher esse n�vel.\n"
-"\n"
-"\n"
-"\t* Perito: se tem um bom conhecimento sobre o GNU/Linux, pode escolher esta "
-"classe. Como \n"
-"\t  na classe \"Personalizado\", poder� escolher o uso prim�rio (esta��o, "
-"servidor, desenvolvimento)\n"
-"\t  Tenha muito cuidado antes de escolher esta classe. Poder� fazer uma "
-"instala��o bastante personalizada.\n"
-"\t  As respostas a algumas quest�es que podem ser dif�ceis se n�o tiver "
-"conhecimento sobre GNU/Linux.\n"
-"\t  N�o escolha esta classe se n�o souber o que est� a fazer."
 
-#: ../../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 ""
-"Seleccione:\n"
-"\n"
-"  - Personalizado: Se est� suficientemente familiarizado GNU/Linux, pode "
-"ent�o escolher\n"
-"    a utilidade prim�ria para esta m�quina. Veja detalhes abaixo.\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"
-"  - Perito: Pressup�e que est� bastante familiarizado com o GNU/Linux e "
-"quer\n"
-"    executar um instala��o altamente personalizada. Quanto tipo de "
-"instala��o\n"
-"    \"Personalizada\", ter� a possibilidade de escolher a utilidade deste "
-"sistema.\n"
-"    Mas por favor, N�O ESCOLHA ESTA A N�O SER QUE SAIBA O QUE EST� A FAZER!"
+"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 ""
-"Agora deve definir a utiliza��o de sua m�quina. As escolhas s�o:\n"
-"\n"
-"\t* Esta��o de Trabalho: esta � a escolha ideal se pretende usar a sua "
-"m�quina basicamente para uso di�rio, no\n"
-"\t  escrit�rio ou em casa.\n"
-"\n"
-"\n"
-"\t* Desenvolvimento: se pretende usar a sua m�quina primariamente para "
-"desenvolver software, esta � uma boa escolha.\n"
-"\t  Ter� instalado todo os programas necess�rios para compilar, depurar e "
-"editar c�digo fonte,\n"
-"\t  ou criar pacotes de software.\n"
-"\n"
-"\n"
-"\t* Servidor: se pretende usar esta m�quina como servidor, esta � uma boa "
-"escolha. Tanto como servidor de\n"
-"\t  ficheiros (NFS ou SMB), de impress�o (estilo Unix ou Microsoft Windows), "
-"um servidor de autentica��o (NIS), um\n"
-"\t  banco de dados e assim por diante. Como tal, n�o espere que acess�rios "
-"(KDE, GNOME, etc) sejam instalados."
 
-#: ../../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"
-"\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"
+"You may now choose which services you wish to start 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"
+"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"
+"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 tentar� localizar adaptadores PCI SCSI. Se o DrakX encontrar\n"
-"um adaptador SCSI e souber qual driver a utilizar, ele ser� instalado\n"
-"automaticamente\n"
-"\n"
-"\n"
-"Se n�o possuir adaptadores SCSI, um adaptador ISA SCSI ou um PCI SCSI que\n"
-"DrakX n�o reconhece, ser� questionado sobre se algum adaptador SCSI existe "
-"no seu\n"
-"sistema. Se n�o existirem adaptadores, pode clicar em \"N�o\". Se clicar em\n"
-"\"Sim\", uma lista de drivers aparecer� para que possa escolher o seu\n"
-"adaptador.\n"
-"\n"
-"\n"
-"Se tem que especificar manualmente o seu adaptador, DrakX perguntar� \n"
-"se quer especificar op��es para ele. Pode deixar que o DrakX examine o "
-"hardware\n"
-"para descobrir as op��es. Isso normalmente funciona bem.\n"
-"\n"
-"\n"
-"Se n�o, precisar� definir as op��es para o driver. Por favor veja o Guia do "
-"Utilizador\n"
-"(cap�tulo 3, sec��o \"Recolhendo informa��es sobre o seu hardware) para "
-"dicas sobre\n"
-"como descobrir essas informa��es na documenta��o do hardware, no Web site\n"
-"do fabricante (se tiver acesso � Internet) ou no Microsoft Windows\n"
-"(se o tiver no seu sistema)."
 
-#: ../../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 ""
 
-#: ../../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"
+"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"
-"\"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..."
+"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 ""
-"Escolha o disco r�gido que quer apagar para instalar\n"
-"o Linux-Mandrake. Tenha cuidado, pois todos os dados existentes ser�o\n"
-"perdidos e n�o poder�o ser recuperados."
 
-#: ../../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 "Por favor seja paciente. Essa opera��o pode demorar v�rios minutos."
-
-#: ../../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"
+" * \"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"
-"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
+#: ../../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 ""
-"Pode agora seleccionar o grupo de pacotes que \n"
-"desejar instalar ou actualizar.\n"
-"\n"
-"\n"
-"O DrakX verificar� se tem espa�o suficiente para os instalar.Se n�o,\n"
-"tiver ser� avisado. Se quiser continuar mesmo assim, poder� proceder �\n"
-"instala��o de todos os grupos seleccionados, mas alguns grupos de menor\n"
-"interesse n�o ser�o instalados. No fim da lista pode seleccionar \n"
-"a op��o \"Selec��o individual de pacotes\"; neste caso poder� navegar\n"
-"entre mais de 1000 pacotes..."
-
-#: ../../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 ""
-"Agora pode seleccionar individualmente todos os\n"
-"pacotes que deseja instalar.\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"
-"Pode expandir ou encolher a �rvore clicando na op��o no canto esquerdo da\n"
-"janela de pacotes.\n"
-"\n"
-"\n"
-"Se quiser ver os pacotes em ordem alfab�tica, clique no �cone\n"
-"\"Alternar entre organiza��o plana ou em grupo\".\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"
-"Se n�o quer ser avisado acerca das depend�ncias, clique em \"Depend�ncias\n"
-"Autom�ticas\". Se fizer isto, tome em aten��o que ao eliminar a selec��o de "
-"um pacote pode silenciosamente \n"
-"eliminar a selec��o de outros pacotes que dependem dele."
-
-#: ../../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 ""
-"Se tiver todos os CDs da lista acima, clique em Ok. Se n�o tiver \n"
-"nenhum desses CDs, clique em Cancelar. Se apenas alguns CDs estiverem,\n"
-"em falta, desmarque-os e ent�o clique em Ok."
 
-#: ../../help.pm_.c:369
+#: ../../help.pm_.c:376
+#, fuzzy
 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 ""
-"O seu novo sistema operativo Linux-Mandrake est� ser instalado\n"
+"O seu novo sistema operativo Mandrake Linux est� ser instalado\n"
 "Essa opera��o deve demorar algumas minutos (isso depende do tamanho que\n"
 "escolheu para instalar e a velocidade do seu computador).\n"
 "\n"
 "\n"
 "Por favor seja paciente."
 
-#: ../../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 ""
-"Agora pode testar seu rato. Use os bot�es e a roda para\n"
-"verificar se as configura��es est�o correctas. Se n�o estiverem, pode "
-"clicar\n"
-"em \"Cancelar\" e escolher outro driver."
 
-#: ../../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 ""
-"Por favor seleccione a porta correta. Por exemplo, a porta COM1\n"
-"no MS Windows � chamada ttyS0 no GNU/Linux."
 
-#: ../../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 ""
-"Se deseja ligar o seu computador � Internet ou\n"
-"� uma rede local, escolha a op��o correta. Por favor ligue o seu dispositivo "
-"antes\n"
-"de escolher a op��o correta para deixar o DrakX o detectar automaticamente.\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"
-"Se n�o tiver nenhuma liga��o � Internet ou a uma rede local, escolha\n"
-"\"Desactivar rede\".\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"
-"Se desejar configurar sua rede depois da instala��o ou se tiver terminado\n"
-"de configurar sua liga��o � rede, escolha \"Pronto\"."
-
-#: ../../help.pm_.c:399
-msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\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"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-"Nenhum modem foi detectado. Por favor escolha a porta s�rie a que o seu "
-"modem est� ligado.\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"
-"Nota, a primeira porta s�rie (chamada \"COM1\" no Microsoft Windows)\n"
-"� chamada \"ttyS0\" no 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 ""
-"Pode agora configurar as op��es de marca��o telef�nica . Se \n"
-"n�o sabe ou n�o tem certeza sobre o que colocar, as informa��es corretas "
-"podem\n"
-"ser obtidas no seu Provedor de Internet. Se n�o digitar o DNS \n"
-"(nome do servidor) aqui, essa informa��o ser� obtida com o seu Provedor de "
-"Internet\n"
-"na hora da liga��o."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Se o seu modem for um modem externo, por favor ligue agora para o DrakX o "
-"detectar automaticamente."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Por favor ligue o seu modem e escolha o modem correcto."
-
-#: ../../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 ""
-"Se n�o tem certeza se as informa��es acima\n"
-"est�o correctas ou se n�o sabe ou n�o tem certeza sobre o que colocar,\n"
-"as informa��es correctas podem ser obtidas com o seu Provedor de Internet. "
-"Se \n"
-"n�o digitar o DNS (nome do servidor) aqui, essa informa��o ser� obtida com o "
-"seu\n"
-"Provedor de Internet na hora da liga��o."
-
-#: ../../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 ""
-"Agora pode entrar com o nome do host, se necess�rio. Se \n"
-"n�o tem certeza sobre o que colocar, a informa��o correta pode ser obtida\n"
-"com o seu provedor."
-
-#: ../../help.pm_.c:431
-msgid ""
-"You may now configure your network device.\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\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"
+"When a partition is selected, you can use:\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 to create a new partition (when an empty partition is selected);\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
-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 ""
-"Pode agora colocar o nome do seu host, se necess�rio.\n"
-" Se n�o sabe sobre o que colocar, pergunte ao administrador da rede."
-
-#: ../../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 ""
-"Pode agora colocar o nome do 'host', se necess�rio.\n"
-"Se n�o sabe ou n�o tem certeza, deixe em branco."
-
-#: ../../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 ""
-"Agora pode entrar com as op��es marca��o da liga��o. Se n�o tem certeza "
-"sobre\n"
-"o que colocar, a informa��o correcta pode ser obtida com o seu provedor."
-
-#: ../../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 ir� usar proxies, por favor configure agora. Se  n�o sabe se\n"
-"ir� usar proxies, pergunte ao seu administrador de rede ou ao seu provedor."
-
-#: ../../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"
+" * Ctrl-d to delete a partition;\n"
 "\n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
+"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 ""
-"Pode instalar o pacote criptogr�fico se sua liga��o com a Internet foi\n"
-"configurada correctamente. Primeiro, escolha um 'mirror' de onde deseja "
-"descarregar\n"
-"os pacotes e ap�s isso, seleccione os pacotes a serem instalados.\n"
-" \n"
-"\n"
-"Note que deve escolher o 'mirror' (espelho) e pacotes criptogr�fico de\n"
-"acordo com a sua legisla��o."
 
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Agora pode escolher o seu fuso hor�rio de acordo com onde vive."
-
-#: ../../help.pm_.c:471
+#: ../../help.pm_.c:460
 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"
+"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"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"GNU/Linux gere o tempo em GMT (Tempo do \n"
-"Meridiano de Greenwich), e o converte de acordo com a zona de fuso \n"
-"hor�rio que seleccionou.\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"
-"Se usar o Microsoft Windows neste computador, escolha \"N�o\"."
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard drives:\n"
+"\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+"\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"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 ""
 
-#: ../../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)."
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
-"Pode configurar uma impressora local (ligada ao seu computador),\n"
-"ou remota (acess�vel via uma rede Unix, Netware ou Microsoft Windows)."
 
-#: ../../help.pm_.c:496
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\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"
-"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"
+"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"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\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"
-"If you don't have printer, click on \"None\"."
+" * 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: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"
+"Por favor escolha \"Instalar\" caso n�o exista nenhuma vers�o anterior do "
+"Mandrake Linux\n"
+"instalado ou se deseja utilizar v�rios sistemas operativos.\n"
 "\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
 "\n"
+"Por favor escolha \"Actualizar\" se desejar actualizar uma vers�o instalada "
+"do Mandrake Linux.\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 ""
-
-#: ../../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"
+"Dependendo do seu conhecimento sobre GNU/Linux, voc� pode escolher um dos "
+"seguintes n�veis para instalar\n"
+"ou actualizar o seu Mandrake Linux:\n"
 "\n"
+"* Recomendado: se nunca instalou um sistema GNU/Linux escolha esse. A "
+"instala��o ser� \n"
+"  f�cil e ser�o feitas apenas algumas perguntas.\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"
+"* Personalizado: se estiver familiarizado com o GNU/Linux, pode escolher o "
+"uso prim�rio (esta��o, \n"
+"  servidor, desenvolvimento) do seu sistema. Responder� a mais perguntas do "
+"que na classe de instala��o\n"
+"  \"Recomendada\", precisa ent�o de saber com o GNU/Linux funciona para "
+"poder escolher esse n�vel.\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"
+"* Perito: se tem um bom conhecimento sobre o GNU/Linux, pode escolher esta "
+"classe. Como \n"
+"  na classe \"Personalizado\", poder� escolher o uso prim�rio (esta��o, "
+"servidor, desenvolvimento)\n"
+"  Tenha muito cuidado antes de escolher esta classe. Poder� fazer uma "
+"instala��o bastante personalizada.\n"
+"  As respostas a algumas quest�es que podem ser dif�ceis se n�o tiver "
+"conhecimento sobre GNU/Linux.\n"
+"  N�o escolha esta classe se n�o souber o que est� a fazer."
+
+#: ../../help.pm_.c:521
+msgid ""
+"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"
-"   * 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"
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:534
 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"
+"Please choose your preferred language for installation and system usage.\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"
+"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"
-"   * 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"
+"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:573
+#: ../../help.pm_.c:547
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\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"
-"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 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 ""
-"A sua impressora n�o foi detectada. Por favor digite o nome do dispositivo "
-"ao\n"
-"qual est� ligada.\n"
-"\n"
-"\n"
-"Nota, a maioria das impressoras est�o ligadas � primeira porta paralela.\n"
-"Tem o nome de \"/dev/lp0\" no GNU/Linux e \"LPT1\" no MicrosoftWindows."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Agora deve seleccionar sua impressora da lista acima."
 
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:560
 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."
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
 msgstr ""
-"Por favor seleccione as op��es correctas de acordo com a sua impressora.\n"
-"Por favor verifique a documenta��o dela se n�o sabe o que escolher aqui.\n"
-"\n"
-"\n"
-"Poder� testar a sua configura��o no pr�ximo passo e ser� capaz de a "
-"modificar se n�o estiver a funcionar correctamente."
 
-#: ../../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"
-"\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"
+"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"
-"\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 ""
-"Agora deve indicar a senha root do seu sistema Linux-Mandrake.\n"
-"A senha deve ser introduzida duas vezes para verificar se as senhas\n"
-"introduzidas s�o id�nticas.\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"
-"Root � o administrador do sistema, e � o �nico utilizador que pode "
-"modificar\n"
-"a\n"
-"configura��o do sistema. Ent�o escolha a senha com cuidado\n"
-"Uso n�o-autorizado da conta root pode ser extremamente perigoso\n"
-"para � integridade\n"
-"do sistema, para os seus dados, e outros sistemas a ele ligados.\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"
-"A senha deve ser uma mistura de caracteres alfa-num�ricos com no m�nimo 8\n"
-"caracteres. Ela nunca deve ser anotada.\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"
-"N�o crie uma senha muito grande ou muito complicada, tem que ser capaz\n"
-"de lembrar dela sem muita dificuldade."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Para ter um sistema mais seguro, deve escolher \"Usar ficheiro shadow\"\n"
-"e \"Usar senhas MD5\"."
-
-#: ../../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 computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Se a sua rede usa NIS, seleccione \"Usar NIS\". Se n�o sabe, pergunte\n"
-"ao seu administrador de rede."
 
-#: ../../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 ""
-"Agora pode criar uma ou mais contas de utilizadores \"normais\"\n"
-"por oposi��o � conta \"privilegiada\" do root. Pode criar uma\n"
-"ou mais contas para cada pessoa que quer permitir que use este\n"
-"computador. Note que cada conta de utilizador tem suas pr�prias "
-"prefer�ncias\n"
-"(ambiente gr�fico, configura��o de programas, etc.) e a sua pr�pria\n"
-"\"directoria pessoal\" que � o local onde essas prefer�ncias ir�o ser\n"
-"guardadas.\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"
-"Em primeiro lugar, crie uma conta para si! Mesmo que seja o �nico "
-"utilizador\n"
-"da m�quina, N�O pode entrar como root para o uso di�rio deste sistema:\n"
-"� um risco muito grande. Pode deixar o sistema defeituoso por erro de "
-"digita��o\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"
-"Al�m do mais, deve entrar no sistema usando a conta de utilizador\n"
-"que criou aqui, e entrar como root apenas e somente para prop�sitos de\n"
-"manuten��o e administra��o."
-
-#: ../../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 ""
-"A cria��o de uma disquete de arranque � altamente recomendada.\n"
-"Se n�o conseguir arrancar o seu computador, � a �nica maneira\n"
-"de resgatar o seu sistema sem ter que o reinstalar."
-
-#: ../../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 ""
-"Precisa indicar onde deseja guardar a \n"
-"informa��o necess�ria para arrancar o GNU/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"
-"A n�o ser que saiba exactamente o que est� fazer, escolha \"Primeiro\n"
-"sector do drive (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 ""
-"A n�o ser que saiba especificamente o contr�rio, a escolha comum �\n"
-"\"/dev/hda\" (disco IDE mestre do canal prim�rio) ou \"/dev/sda\"  (primeiro "
-"disco SCSI)."
 
-#: ../../help.pm_.c:653
+#: ../../help.pm_.c:647
 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"
+"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 ""
+
+#: ../../help.pm_.c:658
+msgid ""
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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!"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
 msgstr ""
 
 #: ../../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"
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\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"
+" * \"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"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \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 tentar� localizar adaptadores PCI SCSI. Se o DrakX encontrar\n"
+"um adaptador SCSI e souber qual driver a utilizar, ele ser� instalado\n"
+"automaticamente\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
+"Se n�o possuir adaptadores SCSI, um adaptador ISA SCSI ou um PCI SCSI que\n"
+"DrakX n�o reconhece, ser� questionado sobre se algum adaptador SCSI existe "
+"no seu\n"
+"sistema. Se n�o existirem adaptadores, pode clicar em \"N�o\". Se clicar em\n"
+"\"Sim\", uma lista de drivers aparecer� para que possa escolher o seu\n"
+"adaptador.\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"
+"Se tem que especificar manualmente o seu adaptador, DrakX perguntar� \n"
+"se quer especificar op��es para ele. Pode deixar que o DrakX examine o "
+"hardware\n"
+"para descobrir as op��es. Isso normalmente funciona bem.\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 ""
+"Se n�o, precisar� definir as op��es para o driver. Por favor veja o Guia do "
+"Utilizador\n"
+"(cap�tulo 3, sec��o \"Recolhendo informa��es sobre o seu hardware) para "
+"dicas sobre\n"
+"como descobrir essas informa��es na documenta��o do hardware, no Web site\n"
+"do fabricante (se tiver acesso � Internet) ou no Microsoft Windows\n"
+"(se o tiver no seu sistema)."
 
-#: ../../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"
+"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"
-"\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"
-"\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"
-"\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"
+"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"
-"  - 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"
+" * 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"
-"  - 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 � um Carregador de arranque para SPARC: � capaz de\n"
-"de arrancar tanto o GNU/Linux como qualquer outro sistema\n"
-"operativo instalado. Normalmente, estes sistemas s�o detectados e\n"
-"instalados correctamente. Se este n�o for o caso, pode adicionar\n"
-"entradas manualmente neste ecr�. Cuidado ao escolher os par�metros "
-"correctos.\n"
-"\n"
-"\n"
-"Pode tamb�m n�o dar acesso a esses sistemas operativos a\n"
-"ningu�m, neste pode eliminar as entradas correspondentes. Mas \n"
-"precisar� de uma disquete de arranque para os poder utilizar!"
 
-#: ../../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 ""
-"As principais op��es do SILO s�o:\n"
-"  - Instala��o do carregador de arranque: Indique onde quer colocar\n"
-"  a informa��o necess�ria para entrar no GNU/Linux. A n�o ser que\n"
-"saiba o que faz, escolha \"Primeiro sector do drive (MBR)\".\n"
-"\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
 "\n"
-"  - Tempo de espera antes do arranque padr�o: Especifica o tempo em d�cimos\n"
-"de segundo que o carregador de arranque deve esperar antes de entrar\n"
-"na primeira imagem. Isso � �til em sistemas que fazem o arranque\n"
-"imediato do disco r�gido antes de activar o teclado. O carregador de\n"
-"arranque n�o ir� esperar se \"delay\" for omitido ou com o\n"
-"valor zero."
-
-#: ../../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 ""
-"Agora tem de configurar o X Window System, que � o centro\n"
-"do Interface Gr�fica do GNU/Linux (Linux GUI). Para isso, deve\n"
-"configurar sua placa de v�deo e monitor. A maioria destes passos\n"
-"s�o autom�ticos, pode ser que o seu trabalho seja apenas\n"
-"o de verificar o que foi feito e aceitar as configura��es :)\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"
-"Quando a configura��o acabar, o X ser� reiniciado (a n�o ser que\n"
-"pe�a ao Drakx para o n�o fazer) para verificar se as configura��es\n"
-"est�o correctas. Se elas n�o o satisfizerem pode alterar estas \n"
-"configura��es quantas vezes forem necess�rias."
-
-#: ../../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 ""
-"Se algo estiver errado na configura��o do X, use estas op��es para \n"
-"configurar correctamente o X Window System."
 
-#: ../../help.pm_.c:835
+#: ../../help.pm_.c:827
 msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
+"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 ""
-"Se preferir o login gr�fico, seleccione \"Sim\". Caso contr�rio,\n"
-"escolha \"N�o\"."
 
-#: ../../help.pm_.c:839
+#: ../../help.pm_.c:832
 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"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
+"\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
 
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"O seu sistema arrancar� novamente.\n"
-"\n"
-"Ap�s reiniciar, o seu novo sistema Linux Mandrake iniciar� automatica-\n"
-"mente. Se quiser arrancar outro sistema operativo existente,\n"
-"leia por favor as instru��es adicionais."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Escolha a seu idioma"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Seleccione a classe da instala��o"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Detec��o de discos r�gidos"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Configurar rato"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Escolha o seu teclado"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Seguran�a"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Configurar sistemas de ficheiros"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formatar parti��es"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Escolha os pacotes a serem instalados"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Instalar sistema"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Especificar senha do root"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Adicionar um utilizador"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Configurar rede"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Sum�rio"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Configurar servi�os"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Criar um disco de arranque"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Instalar carregador de arranque"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Configurar X"
 
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Sair da instala��o"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3420,21 +3049,31 @@ msgid ""
 "\n"
 "Do you really want to install these servers?\n"
 msgstr ""
+"Seleccionou o(s) seguinte(s) servidor(es): %s\n"
+"\n"
+"\n"
+"Estes servidores s�o activados por omiss�o. N�o possuem nenhum problema\n"
+"de seguran�a conhecido, mas algum novo pode ser encontrado. Neste caso, "
+"certifique-se \n"
+"da sua actualiza��o logo que poss�vel.\n"
+"\n"
+"\n"
+"Deseja mesmo instalar estes servidores?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
-msgstr ""
+msgstr "N�o � poss�vel usar 'broadcast' sem algum dom�nio NIS"
 
-#: ../../install_any.pm_.c:676
-#, c-format
+#: ../../install_any.pm_.c:793
+#, fuzzy, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "Insira uma disquete formatada tipo FAT no drive %s"
+msgstr "Insira uma disquete no drive %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
-msgstr "Esta disquete n�o est� formatada no tipo FAT "
+msgstr ""
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3442,30 +3081,20 @@ msgstr ""
 "Para usar esta selec��o guardada de pacotes, arranque a instala��o com "
 "``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Erro ao ler o ficheiro $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Erro ao ler o ficheiro %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 "Por favor teste o rato"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Para activar o rato,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "MOVA SUA RODA!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3475,7 +3104,7 @@ msgstr ""
 "Algum hardware no seu computador precisa de drivers ``propriet�rios'' \n"
 "para funcionar. Pode encontrar mais informa��es em: %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"
@@ -3485,11 +3114,11 @@ msgstr ""
 "Para isso, crie uma parti��o (ou clique numa existente).\n"
 "Ent�o escolha a ac��o ``Ponto de montagem'' e defina-a como `/'"
 
-#: ../../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 "Tem que ter uma parti��o 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"
@@ -3499,55 +3128,60 @@ msgstr ""
 "\n"
 "Continuar mesmo assim?"
 
-#: ../../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 "Tem que ter uma parti��o swap"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Usar espa�o livre"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Sem espa�o livre suficiente para alocar as novas parti��es"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Usar a parti��o existente"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "N�o existe nenhuma parti��o para usar"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Usar a parti��o Windows para loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Qual parti��o que quer usar para o Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Escolha os tamanhos"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Tamanho da parti��o root em MB:"
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Tamanho da parti��o swap em MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Usar o espa�o livre na parti��o Windows"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Qual parti��o que quer redimensionar?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Computando limites do sistema de ficheiros do Windows"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3556,12 +3190,12 @@ msgstr ""
 "O redimensionador de FAT � incapaz de manipular sua parti��o, \n"
 "ocorreu o seguinte erro: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "A sua parti��o Windows est� muito fragmentada, corra primeiro o ``defrag''"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3579,21 +3213,21 @@ msgstr ""
 "ent�o reiniciar a instala��o. Tamb�m deveria fazer backup dos seus\n"
 "dados. Quando tiver certeza, pressione Ok."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Quanto de espa�o quer deixar para o windows em"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "parti��o %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Falha no redimensionamento 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)"
@@ -3601,33 +3235,33 @@ msgstr ""
 "N�o existem parti��es FAT para redimensionar ou para usar como loopback (ou "
 "n�o existe espa�o suficiente)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Apagar o disco inteiro"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Remover 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 "Tem mais de um disco r�gido, em qual deles quer instalar o 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 ""
 "Todas as parti��es existentes e os dados nelas contidos ser�o perdidos %s"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Particionamento de disco personalizado"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Usar fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3636,28 +3270,28 @@ msgstr ""
 "Pode agora particionar %s.\n"
 "Quando terminar, n�o esque�a de guardar usando `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "N�o tem espa�o livre suficiente na sua parti��o Windows"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "N�o consigo encontrar espa�o para instala��o"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "O assistente de particionamento DrakX encontrou as seguintes solu��es:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "O particionamento falhou: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "A ligar a rede"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "A desligar a rede"
 
@@ -3669,12 +3303,12 @@ msgstr ""
 "Ocorreu um erro, mas eu n�o sei como lidar com ele.\n"
 "Continue a seu pr�prio risco."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Ponto de montagem %s duplicado"
 
-#: ../../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"
@@ -3686,16 +3320,16 @@ msgstr ""
 "Verifique o cdrom num computador instalado usando \"rpm -qpl Mandarke/RPMS/*."
 "rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Bem-vindo � %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Nenhum drive de disquete dispon�vel"
 
-#: ../../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"
@@ -3709,32 +3343,32 @@ msgstr "Escolha o tamanho que deseja instalar"
 msgid "Total size: "
 msgstr "Tamanho 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 "Vers�o: %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 "Tamanho: %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 "Escolha os pacotes que deseja instalar"
 
-#: ../../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 "Informa��o"
 
-#: ../../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 "Instalar"
 
-#: ../../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 "A instalar"
 
@@ -3742,7 +3376,7 @@ msgstr "A instalar"
 msgid "Please wait, "
 msgstr "Por favor aguarde, "
 
-#: ../../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 restante "
 
@@ -3751,21 +3385,21 @@ msgid "Total time "
 msgstr "Tempo total "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "A preparar a instala��o"
 
-#: ../../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 "A instalar pacote %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 "Continuar mesmo assim?"
 
-#: ../../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 "Houve um erro na ordena��o dos pacotes:"
 
@@ -3773,31 +3407,35 @@ msgstr "Houve um erro na ordena��o dos pacotes:"
 msgid "Use existing configuration for X11?"
 msgstr "Usar a configura��o existente para o 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 ""
 "Seu sistema est� com poucos recursos. Pode ter algum problema na\n"
-"instala��o do Linux-Mandrake. Se isso ocorrer, pode tentar instalar usando "
+"instala��o do Mandrake Linux. Se isso ocorrer, pode tentar instalar usando "
 "o\n"
 "modo texto. Para isso, prima `F1' no quadro de inicializa��o e escreva "
 "`text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Classe de Instala��o"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Por favor escolha uma das seguintes classes de instala��o:"
 
-#: ../../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 ""
 "O tamanho total dos grupos que seleccionou � de aproximadamente %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"
@@ -3812,7 +3450,7 @@ msgstr ""
 "Uma baixa percentagem ir� instalar apenas os pacotes mais importantes;\n"
 "uma percentagem de 100%% ir� instalar todos os pacotes seleccionados."
 
-#: ../../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"
@@ -3829,84 +3467,68 @@ msgstr ""
 "Uma baixa percentagem ir� instalar apenas os pacotes mais importantes;\n"
 "uma percentagem de %d%% ir� instalar o m�ximo de pacotes poss�vel."
 
-#: ../../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 "Ser� capaz de escolher mais precisamente no pr�ximo passo"
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Percentagem de pacotes a serem instalados"
 
-#: ../../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 "Selec��o de Grupo de Pacotes"
 
-#: ../../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 "Selec��o individual de pacotes"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Expandir �rvore"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Encolher �rvore"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Alternar entre organiza��o plana ou em grupo"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Tamanho total: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Pacote defeituoso"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nome: %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 "Tamanho 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 ""
 "N�o pode seleccionar esse pacote pois n�o existe espa�o livre para o instalar"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Os seguintes pacotes ser�o instalados"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Os seguintes pacotes ser�o removidos"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "N�o pode seleccionar/deselecionar esse pacote"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Este � um pacote obrigat�rio, tem que ser seleccionado"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "N�o pode deixar de seleccionar este pacote. Ele j� est� instalado"
 
-#: ../../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?"
@@ -3914,25 +3536,44 @@ msgstr ""
 "Este pacote tem que ser actualizado\n"
 "Tem certeza que n�o o quer seleccionar?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 "N�o pode deixar de seleccionar este pacote. Ele tem que ser actualizado"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Mostrar automaticamente pacotes seleccionados"
+
+#: ../../install_steps_gtk.pm_.c:460
+#, fuzzy
+msgid "Load/Save on floppy"
+msgstr "Guardar em disquete"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "Guardar selec��o de pacotes"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "Sair da instala��o"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "A estimar"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Por favor aguarde, a preparar a instala��o"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d pacotes"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -3964,15 +3605,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 "Aceitar"
 
-#: ../../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 "Recusar"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -3987,7 +3628,7 @@ msgstr ""
 "estiver pronto.\n"
 "Se n�o o tiver, prima Cancelar para evitar a instala��o deste Cd-Rom."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Houve um erro a instalar os pacotes:"
 
@@ -3995,34 +3636,21 @@ msgstr "Houve um erro a instalar os pacotes:"
 msgid "An error occurred"
 msgstr "Ocorreu um erro"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Por favor escolha o idioma a ser utilizado."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "Pode escolher outros idiomas que estar�o dispon�veis ap�s a instala��o"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Tudo"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Contrato de licen�a"
 
-#: ../../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"
@@ -4076,7 +3704,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"
@@ -4113,7 +3741,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"
@@ -4133,103 +3761,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 "Teclado"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Por favor escolha o tipo de teclado."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "Aqui est� a lista completa de teclados dispon�veis"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Classe de Instala��o"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Que classe de instala��o deseja?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Instalar/Actualizar"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Isso � uma instala��o ou actualiza��o?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Recomendado"
 
-#: ../../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 "Perito"
 
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:212
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../../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 "Por favor escolha o tipo de rato."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Porta do Rato"
 
-#: ../../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 "Por favor escolha a que porta s�rie o rato est� ligado."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
-msgstr ""
+msgstr "Emula��o de bot�es"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
-msgstr ""
+msgstr "Emula��o Bot�o 2"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
-msgstr ""
+msgstr "Emula��o Bot�o 3"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "A configurar cart�es 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 "A configurar 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 "sem parti��es dispon�veis"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Procurando parti��es para encontrar pontos de montagem"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Escolha os pontos de montagem"
 
-#: ../../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"
@@ -4244,7 +3868,7 @@ msgstr ""
 "ser�o perdidos!). A outra solu��o � n�o deixar o DrakX modificar a tabela\n"
 "de parti��es. (o erro � %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!"
@@ -4252,51 +3876,62 @@ msgstr ""
 "O DiskDrake falhou na leitura da tabela de parti��es.\n"
 "Continue por sua conta e risco!"
 
-#: ../../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 "Escolha as parti��es que quer formatar"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Parti��o Root"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Qual a parti��o root (/) do seu 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 ""
 "Precisa reiniciar para que as modifica��es na tabela de parti��o tenham "
 "efeito"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Escolha as parti��es que quer formatar"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Verificar blocos defeituosos?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "A formatar parti��es"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "A criar e formatar ficheiro %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "Sem 'swap' suficiente para completar a instala��o, por favor adicione mais"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "A procurar pacotes dispon�veis"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "A procurar pacotes para actualizar"
 
-#: ../../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)"
@@ -4304,30 +3939,59 @@ msgstr ""
 "O seu sistema n�o tem espa�o suficiente para instala��o ou actualiza��o (%d "
 "> %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Completa (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "M�nima (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Recomendada (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../../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
+#, fuzzy
+msgid "Load from floppy"
+msgstr "Restaurar da disquete"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Loading from floppy"
+msgstr "Restaurar da disquete"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "Selec��o de Pacotes"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "Insira uma disquete no drive %s"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Guardar em disquete"
+
+#: ../../install_steps_interactive.pm_.c:605
+msgid "Selected size is larger than available space"
+msgstr "O tamanho seleccionado � maior que o espa�o dispon�vel"
+
+#: ../../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"
@@ -4337,12 +4001,12 @@ msgstr ""
 "Se n�o tiver nenhum desses CDs, clique em Cancelar.\n"
 "Se apenas alguns CDs estiverem em falta, desmarque-os e ent�o clique em Ok."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom rotulado como \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4351,11 +4015,21 @@ msgstr ""
 "Instalando o pacote %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Configura��o p�s-instala��o"
 
-#: ../../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 "Insira uma disquete no drive %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Insira uma disquete vazia no drive %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4431,93 +4105,138 @@ 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 "Escolha um 'mirror' de onde obter os pacotes"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "A contactar o 'mirror' para obter a lista de pacotes dispon�veis"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Por favor escolha os pacotes que quer instalar."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Qual � o seu fuso hor�rio?"
 
-#: ../../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 "O seu rel�gio de hardware est� definido 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 "Servidor NTP"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Servidor CUPS remoto"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Nenhuma impressora"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Sum�rio"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Rato"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Fuso hor�rio"
 
-#: ../../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 "Placa RDIS"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Placa de Som"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "Placa TV"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Que sistema de impress�o deseja usar?"
+#: ../../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: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
+#, 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 "Especificar senha do root"
+
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Nenhuma senha"
 
-#: ../../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 "Essa senha � muito simples (deve ter ao menos %d caracteres)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Usar NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autentica��o?"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "p�ginas amarelas"
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "Autentica��o?"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:951
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Servidor"
+
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "Autentica��o NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "Dom�nio 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 "
@@ -4549,19 +4268,19 @@ msgstr ""
 "disquete\n"
 "no drive e aperte em \"OK\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Primeiro drive de disquetes"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Segundo drive de disquetes"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Saltar"
 
-#: ../../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 "
@@ -4585,33 +4304,41 @@ msgstr ""
 "tornando muito mais f�cil recuperar o sistema com danos graves.\n"
 "Deseja criar uma disquete de arranque para o seu sistema?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Desculpe, nenhum drive de disquetes dispon�vel"
 
-#: ../../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 ""
 "Escolha o drive de disquetes que quer usar para criar a disquete de arranque"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Insira uma disquete no drive %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "A criar disquete de arranque"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "A preparar o carregador de arranque"
 
-#: ../../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 "Quer usar o 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?"
@@ -4619,52 +4346,55 @@ msgstr ""
 "Erro ao instalar o aboot, \n"
 "tentar for�ar a instala��o, mesmo que isso destrua a primeira parti��o?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Instalar carregador de arranque"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 "A instala��o do carregador de arranque falhou. Ocorreram os seguintes erros:"
 
-#: ../../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 "Baixo"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "M�dio"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Alto"
 
-#: ../../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 "Escolha o n�vel de seguran�a"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "Quer criar uma disquete de auto-instala��o para replica��o do 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 "Insira uma disquete vazia no drive %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 "A criar disquete de auto-instala��o"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -4674,30 +4404,30 @@ msgstr ""
 "\n"
 "Quer realmente sair agora?"
 
-#: ../../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 ""
 "Parab�ns, a instala��o est� completa.\n"
-"Para informa��es sobre correc��es para esta vers�o do Linux Mandrake\n"
-"consulte a Errata dispon�vel em http://www.linux-mandrake.com/.\n"
+"Para informa��es sobre correc��es para esta vers�o do Mandrake Linux\n"
+"consulte a Errata dispon�vel em http://www.mandrakelinux.com/.\n"
 "\n"
 "Informa��o sobre como configurar o seu sistema est� dispon�vel no\n"
-"cap�tulo p�s-instala��o do Oficial Guia do Utilizador do Linux Mandrake."
+"cap�tulo p�s-instala��o do Oficial Guia do Utilizador do Mandrake Linux."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Criar disquete de auto instala��o"
 
-#: ../../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"
@@ -4711,41 +4441,58 @@ msgstr ""
 "\n"
 "Pode preferir repetir a instala��o.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Autom�tico"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Repetir"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Guardar selec��o de pacotes"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Instala��o do Linux-Mandrake %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Instala��o do 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 op��es  | <Espa�o> selecciona | <F12> pr�ximo passo "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "kdesu em falta"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Escolher ac��o"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Avan�ado"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Por favor aguarde"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Expandir �rvore"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Encolher �rvore"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Alternar entre organiza��o plana ou em grupo"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -4771,267 +4518,289 @@ msgstr "Sua escolha? (por omiss�o %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Sua escolha? (por omiss�o %s introduza `nenhum' para nenhum) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "Checo (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 "Alem�o"
 
-#: ../../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 "Espanhol"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Filand�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 "Noruegu�s"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Russo"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Sueco"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Teclado Ingl�s"
 
-#: ../../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 "Teclado Americano"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "Iraniano"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Arm�nio (velho)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Arm�nio (m�quina de escrever)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Arm�nio (Fon�tico)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbeij�o (latino)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbeij�o (cir�lico)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "B�lgaro"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazileiro (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "Su��o (layout Alem�o)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "Su��o (layout Franc�s)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "Checo (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "Checo (Programadores)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Alem�o (sem teclas mortas)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Dinamarqu�s"
 
-#: ../../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 (Noruegu�s)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estoniano"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgiano (layout \"Russo\")"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgiano (layout \"Latin\")"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Grego"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "H�ngaro"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Israelense"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Israelense (Fon�tico)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iraniano"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Island�s"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japon�s 106 teclas"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Teclado coreano"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latino Americano"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Maced�nio"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Holand�s"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lituano AZERTY (velho)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lituano AZERTY (novo)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lituano \"n�mero de colunas\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituano \"fon�tico\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Localiza��o"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Maced�nio"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Holand�s"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Polaco (layout QWERTY)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Polaco (layout 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 "Canadiano (Quebec)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "Romeno (qwertz)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "Romeno (qwerty)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "Russo (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Sueco"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Eslovaco"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Eslovaco (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Eslovaco (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Eslovaco (Programadores)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbeij�o (cir�lico)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Teclado Tailand�s"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Teclado Tailand�s"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turco (modelo \"F\" tradicional)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turco (modelo moderno \"Q\")"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "Teclado Americano (Internacional)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"n�mero de colunas\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Jugoslavo (latin/cir�lico)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Montagens circulares %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Remova os volumes l�gicos primeiro\n"
 
@@ -5143,170 +4912,220 @@ msgstr "nenhum"
 msgid "No mouse"
 msgstr "Nenhum Rato"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Por favor teste o rato"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Para activar o rato,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "MOVA SUA RODA!"
+
+#: ../../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 "Terminar"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Pr�ximo ->"
 
-#: ../../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 "Isto est� correcto?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Configura��o da Internet"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Ligar � Internet"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Quer tentar ligar-se � Internet agora?"
+#: ../../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 ""
+"A maneira mais comum de se ligar com adsl � pppoe.\n"
+"Mas algumas liga��es usam pptp, poucas usam dhcp.\n"
+"Se n�o sabe, escolha 'usar pppoe'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "A testar a sua liga��o..."
+#: ../../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 "O sistema est� agora ligado � Internet."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "usar dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Por raz�es de Security, ser� desligado(a) agora."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "usar pppoe"
+
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "usar 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 ""
-"O sistema n�o aparenta estar ligado � Internet.\n"
-"Tente reconfigurar a sua liga��o."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Configura��o da Rede"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "Configura��o ISDN"
+"Qual cliente dhcp que deseja usar?\n"
+"Por omiss�o � 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 ""
-"Seleccione o seu provedor.\n"
-" Se n�o estiver na lista, escolha N�o Listado"
+"Nenhum adaptador de rede ethernet foi detectado no seu sistema.\n"
+"Eu n�o posso configurar este tipo de liga��o."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Configura��o da Liga��o"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Escolha o interface de rede"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Por favor preencha ou verifique os campos abaixo"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Por favor escolher o adaptador de rede que quer usar para se ligar � Internet"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ da Placa"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "nenhuma placa de rede encontrada"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Mem�ria da Placa (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "A configurar a rede"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "IO da Placa"
+#: ../../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 ""
+"Por favor introduza o nome do seu anfitri�o(se souber).\n"
+"Alguns servidores DHCP requerem o nome do anfitri�o para funcionar.\n"
+"O nome do anfitri�o deve ser um nome de anfitri�o totalmente qualificado,\n"
+"como por exemplo ``mybox.mylab.myco.com''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "IO_O da Placa"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Nome do anfitri�o"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "IO_1 da Placa"
+#: ../../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 "Assistente de Configura��o da Rede"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "O seu n�mero de telefone pessoal"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Modem ISDN externo"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Nome do provedor (ex: provedor.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Placa ISDN interna"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "N�mero do telefone do provedor"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "De que tipo � sua liga��o ISDN?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "DNS 1 do provedor"
+#: ../../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 do provedor"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "Configura��o total (isdn4net)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Modo de marca��o"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "Configura��o total (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Nome do utilizador da conta"
+#: ../../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 "Configura��o ISDN"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Senha da conta"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Seleccione o seu provedor.\n"
+" Se n�o estiver na lista, escolha N�o Listado"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Protocolo de Arranque"
 
-#: ../../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 "Resto do mundo"
 
-#: ../../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 ""
 "Resto do mundo \n"
 " sem Canal-D (linhas alugadas)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Qual protocolo que quer usar?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Qual tipo de placa tem?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Eu n�o sei"
 
-#: ../../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"
@@ -5318,19 +5137,19 @@ msgstr ""
 "\n"
 "Se tiver uma placa PCMCIA, tem que saber o irq e io da sua placa.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Abortar"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Qual � a sua placa 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."
@@ -5338,111 +5157,61 @@ msgstr ""
 "Eu detectei uma placa ISDN PCI, mas n�o sei qual � o tipo. Por favor "
 "seleccione uma placa PCI no pr�ximo quadro."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "Nenhuma placa ISDN PCI foi encontrada. Por favor seleccione uma no pr�ximo "
 "quadro."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Nenhum adaptador de rede ethernet foi detectado no seu sistema.\n"
-"Eu n�o posso configurar este tipo de liga��o."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Escolha o interface de rede"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Por favor escolher o adaptador de rede que quer usar para se ligar � Internet"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Interface de rede"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Concorda?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Estou pronto a reiniciar o dispositivo de rede:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "Configura��o ADSL"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Quer iniciar a sua liga��o ao iniciar?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Por favor escolha a que porta s�rie o seu modem est� ligado."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Op��es de liga��o"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Nome da liga��o"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "N�mero do telefone"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "ID de Login"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autentica��o?"
+#: ../../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 "Baseado em script"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Baseado em terminal"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Nome do dom�nio"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Primeiro DNS Servidor (opcional)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Second DNS Server (opcional)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"Estou pronto para reiniciar o dispositivo de rede $netc->{NET_DEVICE}. "
-"Concorda?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5450,7 +5219,7 @@ msgstr ""
 "\n"
 "Pode desligar ou reconfigurar a sua liga��o."
 
-#: ../../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."
@@ -5458,11 +5227,11 @@ msgstr ""
 "\n"
 "Pode reconfigurar sua liga��o."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Est� neste momento ligado � Internet."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5470,99 +5239,53 @@ msgstr ""
 "\n"
 "Pode ligar � Internet ou reconfigurar sua liga��o."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "N�o est� neste momento ligado � Internet."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Ligar � Internet"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Desligar da Internet"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Configurar liga��o de rede (LAN ou Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Liga��o e configura��o da Internet"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Assistente de Configura��o da Rede"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Modem ISDN externo"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Placa ISDN interna"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "De que tipo � sua liga��o ISDN?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Ligar � 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'"
+#: ../../network/netconnect.pm_.c:96
+#, fuzzy, c-format
+msgid "We are now going to configure the %s connection."
 msgstr ""
-"A maneira mais comum de se ligar com adsl � pppoe.\n"
-"Mas algumas liga��es usam pptp, poucas usam dhcp.\n"
-"Se n�o sabe, escolha 'usar pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "usar dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "usar pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "usar pptp"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "Estou pronto para reiniciar o dispositivo de rede %s. Concorda?"
+"\n"
+"Pode desligar ou reconfigurar a sua liga��o."
 
-#: ../../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 ""
-"Qual cliente dhcp que deseja usar?\n"
-"Por omiss�o � dhcpcd"
+"\n"
+"Pode desligar ou reconfigurar a sua liga��o."
 
-#: ../../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 "Configura��o da Rede"
 
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Deseja reiniciar a rede"
-
-#: ../../netconnect.pm_.c:904
-#, fuzzy, c-format
-msgid ""
-"A problem occured while restarting the network: \n"
-"\n"
-"%s"
-msgstr "Deseja reiniciar a rede"
-
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -5573,7 +5296,7 @@ msgstr ""
 "Clique em OK para manter a configura��o, ou Cancelar para reconfigurar a sua "
 "liga��o Internet & Rede.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -5585,72 +5308,112 @@ msgstr ""
 "Estamos preparados para configurar a sua liga��o de rede/Internet.\n"
 "Se n�o quiser usar a auto-detec��o, desmarque a op��o.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Escolha o perfil a configurar:"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Usar auto-detec��o"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "A detectar dispositivos..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Liga��o normal via modem"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "detectado na porta %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "Liga��o ISDN"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "detectado %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "Liga��o DSL (ou ADSL)"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "Liga��o � LAN"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "detectado no interface %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Liga��o por Cabo"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "liga��o por cabo detectada"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "Liga��o � LAN"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "placa(s) ethernet detectada(s)"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Como deseja ligar-se � Internet?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "Escolha a ferramenta que deseja usar"
+
+#: ../../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
+msgid "Internet connection"
+msgstr "Liga��o � Internet"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Quer iniciar a sua liga��o ao iniciar?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Configura��o da Rede"
+
+#: ../../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 ""
+"Ocorreu um problema ao reiniciar a rede: \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 ""
 "Parab�ns. A configura��o da rede e da Internet acabou.\n"
 "\n"
-"A configura��o ser� agora aplicada ao seu sistema."
+"A configura��o ser� agora aplicada ao seu 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."
@@ -5658,31 +5421,7 @@ msgstr ""
 "Depois de completado, recomendamos que reinicie o seu \n"
 "ambiente X para evitar o problema da troca de nome do anfitri�o."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "nenhuma placa de rede encontrada"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "A configurar a rede"
-
-#: ../../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 ""
-"Por favor introduza o nome do seu anfitri�o(se souber).\n"
-"Alguns servidores DHCP requerem o nome do anfitri�o para funcionar.\n"
-"O nome do anfitri�o deve ser um nome de anfitri�o totalmente qualificado,\n"
-"como por exemplo ``mybox.mylab.myco.com''."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Nome do anfitri�o"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -5693,7 +5432,7 @@ msgstr ""
 "Apenas aceite manter este dispositivo configurado.\n"
 "A modifica��o dos campos abaixo ir� sobrepor esta configura��o."
 
-#: ../../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"
@@ -5703,38 +5442,38 @@ msgstr ""
 "Cada item deve ser introduzido como endere�o IP ponteado-decimal\n"
 "(por exemplo, 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 "A configurar dispositivo de rede %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (driver $module)"
+#: ../../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 "Endere�o IP"
 
-#: ../../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 "IP Autom�tico"
 
-#: ../../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 "O endere�o IP deve estar no formato 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"
@@ -5746,43 +5485,150 @@ msgstr ""
 "como por exemplo ``mybox.mylab.myco.com'' .\n"
 "Tamb�m pode introduzir o endere�o IP de um gateway se tiver um"
 
-#: ../../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 "Gateway"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Dispositivo de gateway"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Configura��o de proxies"
 
-#: ../../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 "O proxy deve ser http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "O proxy deve ser ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Configura��o da Internet"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Quer tentar ligar-se � Internet agora?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "A testar a sua liga��o..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "O sistema est� agora ligado � Internet."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Por raz�es de Security, ser� desligado(a) agora."
+
+#: ../../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 ""
+"O sistema n�o aparenta estar ligado � Internet.\n"
+"Tente reconfigurar a sua liga��o."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Configura��o da Liga��o"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Por favor preencha ou verifique os campos abaixo"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ da Placa"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Mem�ria da Placa (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "IO da Placa"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "IO_O da Placa"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "IO_1 da Placa"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "O seu n�mero de telefone pessoal"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Nome do provedor (ex: provedor.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "N�mero do telefone do provedor"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Provider dns 1 (opcional)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Provider dns 2 (opcional)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Escolha o seu teclado"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Modo de marca��o"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "Tipo de Liga��o:"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Tipo de Liga��o:"
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Nome do utilizador da conta"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Senha da conta"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Parti��o extendida n�o � suportada nesta plataforma"
 
-#: ../../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 "
@@ -5792,26 +5638,21 @@ msgstr ""
 "A �nica solu��o � mover as suas parti��es prim�rias para ter o buraco "
 "pr�ximo das parti��es extendidas"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Erro ao ler o ficheiro %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "A restaura��o pelo ficheiro %s falhou: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Ficheiro de c�pia de seguran�a defeituoso"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Erro ao escrever no ficheiro %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"
@@ -5841,49 +5682,213 @@ msgstr "bom"
 msgid "maybe"
 msgstr "talvez"
 
-#: ../../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 remoto"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Servidor lpd remoto"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Impressora da rede (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 "Servidor de Impress�o"
 
-#: ../../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 "Dispositivo de Impress�o 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 "(m�dulo %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Seleccionar Liga��o da Impressora"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Como est� a impressora ligada?"
+
+#: ../../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 ""
+"Com um servidor CUPS remoto, n�o tem que configurar\n"
+"nenhuma impressora aqui; elas ser�o detectadas automaticamente.\n"
+"Se tiver d�vidas, seleccione \"Servidor CUPS remoto\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+#, fuzzy
+msgid "None"
+msgstr "Pronto"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Escolha o utilizador por omiss�o :"
+
+#: ../../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 "Fechar"
+
+#: ../../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 "O endere�o IP deve estar no formato 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "O n�mero da porta deve ser num�rico"
+
+#: ../../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 do servidor CUPS"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Porta"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Configura��o do Estilo de Arranque"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "A detectar dispositivos..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Testar portas"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Uma impressora, modelo \"%s\", foi detectado no(a) "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Dispositivo de 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"
@@ -5891,37 +5896,60 @@ msgstr ""
 "A que dispositivo a sua impressora est� ligada \n"
 "(note que /dev/lp0 � equivalente a LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Dispositivo da 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 "Lendo banco de dados de drivers do CUPS"
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Op��es da 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 ""
 "Para usar uma fila de impress�o lpd remota, precisa indicar\n"
 "o nome do anfitri�o e o servidor de impress�o e o nome da\n"
-" fila naquele servidor na qual as impress�es ser�o colocadas."
+"fila naquele servidor."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "Nome do anfitri�o remoto"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Fila remota"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Impressora remota"
+
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
+msgstr "Nome do anfitri�o remoto"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Nome do anfitri�o remoto"
+
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Op��es de Impress�o 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"
@@ -5935,29 +5963,37 @@ msgstr ""
 " o nome de partilha para a impressora que deseja aceder e qualquer \n"
 "informa��o aplic�vel sobre nome de utilizador, senha e grupo de trabalho."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "Anfitri�o servidor SMB"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP do servidor SMB"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Nome de partilha"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Grupo de trabalho"
 
-#: ../../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 "Op��es de Impress�o 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."
@@ -5968,60 +6004,228 @@ msgstr ""
 "impressora\n"
 "que deseja aceder como qualquer nome de utilizador e senha aplic�vel."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Servidor de Impress�o"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Nome da Fila de Impress�o"
 
-#: ../../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 "Op��es da Impressora '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 ""
 "Para imprimir numa impressora 'socket', precisa indicar o \n"
 "nome do servidor da impressora e a n�mero da porta (opcional)."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Nome do Servidor da impressora"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Porta"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "Nome do Servidor da impressora"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Dispositivo de Impress�o URI"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with 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 ""
-"Voc� pode directamente especificar o URI para aceder � impressora com CUPS"
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../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 "Nome da impressora"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Descri��o"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Localiza��o"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Lendo banco de dados de drivers do CUPS"
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "Liga��o da Impressora"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "Qual tipo de impressora que tem?"
 
-#: ../../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 "Configura��o da 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 "Configura��o da 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 "Quer testar a impress�o?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Testar portas"
+
+#: ../../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 "Sim, imprimir ambas as p�ginas de teste"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Impressora"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Padr�o"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "A imprimir p�gina(s) de teste..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "A imprimir p�gina(s) de teste..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "A imprimir p�gina(s) de teste..."
 
-#: ../../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 ""
 "A(s) p�gina(s) foi(foram) enviada(s) para o dem�nio de impress�o.\n"
 "Pode demorar algum tempo antes da impress�o come�ar.\n"
@@ -6030,236 +6234,605 @@ msgstr ""
 "\n"
 "Est� a funcionar correctamente?"
 
-#: ../../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 ""
 "A(s) p�gina(s) foi(foram) enviada(s) para o dem�nio de impress�o.\n"
 "Pode demorar algum tempo antes da impress�o come�ar.\n"
 "Est� a funcionar correctamente?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Sim, imprimir p�gina de teste ASCII"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Sim, imprimir p�gina de teste PostScript"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Nenhuma impressora"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Sim, imprimir ambas as p�ginas de teste"
+#: ../../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 "Configurar 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 "A desligar a rede"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Op��es da impressora"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Tamanho do Papel"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "Lendo banco de dados de drivers do CUPS"
+
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Configura��o da Internet"
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Ejectar p�gina ap�s trabalho de impress�o?"
+#: ../../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:280
-msgid "Uniprint driver options"
-msgstr "Op��es do driver Uniprint"
+#: ../../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:281
-msgid "Color depth options"
-msgstr "Op��es da profundidade de cor"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "Imprimir texto como PostScript?"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "Corrigir texto com stair-stepping?"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "N�mero de p�ginas por p�ginas de sa�da"
+#: ../../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:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "Margem Direita/Esquerda em pontos (1/72 de polegada)"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "Margem Superior/Inferior em pontos (1/72 de polegada)"
+#: ../../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:291
-msgid "Extra GhostScript options"
-msgstr "Op��es extras de GhostScript"
+#: ../../printerdrake.pm_.c:1385
+#, fuzzy
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
+"O nome da impressora deve apenas conter letras, n�meros e 'underscore' '_'"
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Op��es extras de Texto"
+#: ../../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:295
-msgid "Reverse page order"
-msgstr "Inverter a ordem das p�ginas"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Nenhuma impressora"
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "Deseja configurar uma impressora?"
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:1412
+#, c-format
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"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 "Lendo banco de dados de drivers do CUPS"
+
+#: ../../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 "A iniciar a sua liga��o..."
+
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Configurar rede"
+
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitor n�o configurado"
+
+#: ../../printerdrake.pm_.c:1456
+msgid ""
+"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 ""
-"Aqui est�o as seguintes filas de impress�o.\n"
-"Pode adicionar mais ou modificar as existentes."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "A iniciar o CUPS"
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "A configurar a rede"
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
+#: ../../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 ""
+
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
 msgstr "Lendo banco de dados de drivers do CUPS"
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Alto"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paran�ico"
+
+#: ../../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
+msgid "Starting the printing system at boot time"
+msgstr ""
+
+#: ../../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:1727
+#, fuzzy
+msgid "Select Printer Spooler"
 msgstr "Seleccionar Liga��o da Impressora"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Como est� a impressora ligada?"
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Que sistema de impress�o deseja usar?"
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Seleccionar liga��o de impressora remota"
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Configurar Impressora"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Op��es da impressora"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Lendo banco de dados de drivers do CUPS"
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "Deseja configurar uma impressora?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../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"
-"In case of doubt, select \"Remote CUPS server\"."
+"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 ""
-"Com um servidor CUPS remoto, n�o tem que configurar\n"
-"nenhuma impressora aqui; elas ser�o detectadas automaticamente.\n"
-"Se tiver d�vidas, seleccione \"Servidor CUPS remoto\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Modo Normal"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Por omiss�o)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Servidor CUPS remoto"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Servidor CUPS remoto"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Nenhuma impressora"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Quer testar a configura��o?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Configura��o da Internet"
+
+#: ../../printerdrake.pm_.c:2004
+#, 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."
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
 msgstr ""
-"Com um servidor CUPS remoto, n�o tem que configurar\n"
-"nenhuma impressora aqui; elas ser�o detectadas automaticamente\n"
-"a n�o ser que tenha um servidor numa rede diferente;\n"
-"neste �ltimo caso, tem que dar o endere�o IP do\n"
-"servidor CUPS e opcionalmente o n�mero da porta."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "IP do servidor CUPS"
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
-msgstr "O n�mero da porta deve ser num�rico"
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Liga��o � Internet"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Fila remota"
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
+msgstr "Liga��o da Impressora"
+
+#: ../../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 "A imprimir p�gina(s) de teste..."
+
+#: ../../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 "Lendo banco de dados de drivers do 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 "Quer testar a impress�o?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Lendo banco de dados de drivers do CUPS"
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "Configura��o de Proxy"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../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 ""
+"Bem vindo ao utilit�rio de configura��o de proxy.\n"
+"\n"
+"Aqui, poder� definir as proxies http e ftp\n"
+"com ou sem utilizador e palavra-passe\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 ""
-"Cada impressora precisa de um nome (por exemplo\n"
-"lp). Outros par�metros, tal como a descri��o da impressora ou sua\n"
-"localiza��o podem ser definidas. Qual nome que deve ser usado para \n"
-" esta impressora e como a impressora est� ligada?"
+"Por favor preencha as informa��es da proxy para http\n"
+"Deixe em branco se n�o deseja uma proxy para http"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Nome da impressora"
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr "URL"
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "Descri��o"
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+msgid "port"
+msgstr "porta"
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Localiza��o"
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "O Url deve come�ar com 'http:'"
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "A parte da porta deve ser num�rica"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../proxy.pm_.c:59
 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 fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
 msgstr ""
-"Cada fila de impress�o (� qual as impress�es s�o dirigidas) precisa\n"
-"de um nome (normalmente lp) e de uma directoria de spool associada.\n"
-"Qual o nome e a directoria que devem ser utilizados para esta fila?"
+"Por favor preencha as informa��es da proxy para ftp\n"
+"Deixe em branco se n�o deseja uma proxy para ftp"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Nome da fila de impress�o"
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "O Url deve come�ar com 'ftp:'"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Directoria de spool"
+#: ../../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 ""
+"Por favor introduza o utilizador e palavra-passe para proxy, se existir.\n"
+"Deixe em branco se n�o desejar utilizador/palavra-passe"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "Liga��o da Impressora"
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "utilizador"
 
-#: ../../raid.pm_.c:33
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "palavra-passe"
+
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "reintroduza a palavra-passe"
+
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "As palavras-passe n�o coincidem. Tente novamente!"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "N�o � poss�vel adicionar parti��o ao RAID _formatado_ md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "N�o poss�vel escrever o ficheiro $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "N�o poss�vel escrever o ficheiro %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid falhou"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid falhou (talvez as raidtools estejam em falta?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Sem parti��es suficientes para RAID n�vel %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr ""
+msgstr "Inicia o sistema de som ALSA (Advanced Linux Sound Architecture) "
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, um calendarizador de comando peri�dicos"
 
-#: ../../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."
@@ -6268,7 +6841,7 @@ msgstr ""
 "syslog.\n"
 "Pode ser usado tamb�m para desligar a m�quina quando a bateria estiver fraca."
 
-#: ../../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."
@@ -6277,7 +6850,7 @@ msgstr ""
 "at foi executado, e executa comandos em grupo de comandos quando o uso de "
 "mem�ria estiver suficientemente baixo."
 
-#: ../../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 "
@@ -6289,7 +6862,7 @@ msgstr ""
 "UNIX\n"
 "cron b�sico, incluindo melhor seguran�a e melhores op��es de configura��o."
 
-#: ../../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 "
@@ -6300,13 +6873,15 @@ msgstr ""
 "tal como o Midnight Commander. Permite tamb�m copiar e colar utilizando\n"
 "o rato e inclui suporte para menus pop-up na consola."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
+"O HardDrake sonda o hardware, e opcionalmente\n"
+"configura hardware novo ou alterado."
 
-#: ../../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."
@@ -6314,7 +6889,7 @@ msgstr ""
 "Apache � um servidor World Wide Web. Ele � usado para servir ficheiros\n"
 "HTML e 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 "
@@ -6330,13 +6905,15 @@ msgstr ""
 "Desactivando o inetd, todos os servi�os pelos quais � respons�vel \n"
 "tamb�m s�o desactivados."
 
-#: ../../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 ""
+"Inicie o filtro de pacotes para Linux kernel 2.2, para criar \n"
+"uma firewall afim de proteger a sua m�quina de ataques de rede."
 
-#: ../../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"
@@ -6346,23 +6923,27 @@ msgstr ""
 "definido em /etc/sysconfig/keyboard. Isto pode ser seleccionado usando o\n"
 "utilit�rio kbdconfig. Deve deixar isto activado para a maioria da m�quinas."
 
-#: ../../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 ""
+"Regenera��o autom�tica do 'kernel header' em /boot \n"
+"para /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 "Detec��o e configura��o autom�tica de hardware no arranque."
 
-#: ../../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 ""
+"O Linuxconf ir� por vezes executar v�rias tarefas\n"
+"no arranque para manter a configura��o do sistema."
 
-#: ../../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)."
@@ -6372,13 +6953,15 @@ msgstr ""
 "Ele � basicamente um servidor que controla os trabalhos para a(s) impressora"
 "(s)."
 
-#: ../../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 Server, usado para criar um servidor de alta\n"
+"desempenho e disponibilidade."
 
-#: ../../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."
@@ -6386,7 +6969,7 @@ msgstr ""
 "named (BIND) � um Servidor de Nome de Dom�nio (DNS) que � usado para\n"
 "transformar nomes de servidores em endere�os 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."
@@ -6394,7 +6977,7 @@ msgstr ""
 "Monta e desmonta todos os pontos de montagem do Network File\n"
 "System (NFS), SMB (Gestor de Rede/Windows) e NCP (NetWare)."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6402,7 +6985,7 @@ msgstr ""
 "Activa/Desactiva todas os interfaces de rede configurados para iniciar\n"
 "no arranque."
 
-#: ../../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"
@@ -6412,7 +6995,7 @@ msgstr ""
 "de redes TCP/IP. Esse servi�o oferece a funcionalidade do servidor NFS, que "
 "� configurado atrav�s do ficheiro /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."
@@ -6420,17 +7003,19 @@ msgstr ""
 "NFS � um protocolo popular usado na partilha de ficheiros atrav�s de redes\n"
 "TCP/IP. Esse servi�o oferece a funcionalidade de bloquear ficheiros NFS."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
+"Automaticamente ligar o teclado num�rico na consola\n"
+"e XFree no arranque."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr ""
+msgstr "Suporte a OKI 4w e 'winprinters' compat�veis."
 
-#: ../../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 "
@@ -6442,7 +7027,7 @@ msgstr ""
 "configurado de maneira que\n"
 "seguro estar instalado em m�quinas que n�o precisem dele."
 
-#: ../../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 "
@@ -6454,7 +7039,7 @@ msgstr ""
 "m�quinas\n"
 "que actuar�o como servidores para os protocolos que utilizam o mecanismo 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."
@@ -6462,7 +7047,7 @@ msgstr ""
 "Postfix � um Agente de Transporte de Correio, um programa\n"
 "que move mensagens de correio de uma m�quina para outra."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6470,13 +7055,15 @@ msgstr ""
 "Guarda e restaura o 'entropy pool' do sistema para melhor qualidade\n"
 "na gera��o aleat�ria de n�meros."
 
-#: ../../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 ""
+"Designa dispositivos 'raw' a dispositivos de bloco (como \n"
+"parti��es de disco duro), para o uso de aplica��es como 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"
@@ -6487,7 +7074,7 @@ msgstr ""
 "redes, protocolos de 'routing' mais complexos s�o necess�rios em redes mais "
 "complexas."
 
-#: ../../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."
@@ -6495,7 +7082,7 @@ msgstr ""
 "O protocolo rstat permite que utilizadores da rede recebam\n"
 "informa��es sobre a performance de qualquer m�quina naquela rede."
 
-#: ../../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."
@@ -6503,7 +7090,7 @@ msgstr ""
 "O protocolo rusers permite que os utilizadores de uma rede identifiquem\n"
 "quem est� registado (logged) noutras m�quinas que respondam."
 
-#: ../../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)."
@@ -6513,12 +7100,11 @@ msgstr ""
 "utilizadores registados (logged) numa m�quina a correr o dem�nio rwho "
 "(similar ao finger)."
 
-#: ../../services.pm_.c:85
-#, fuzzy
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
-msgstr "Executar o X-Window na inicializa��o"
+msgstr "Iniciar o sistema de som na sua m�quina"
 
-#: ../../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."
@@ -6526,34 +7112,70 @@ msgstr ""
 "Syslog � uma capacidade que muitos dem�nios usam para registar mensagens\n"
 "em v�rios ficheiros de registo. � uma boa ideia correr sempre o syslog."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
-msgstr ""
+msgstr "Carrega os driver para os seus dispositivos usb."
 
-#: ../../services.pm_.c:89
-#, fuzzy
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Inicia e p�ra o X Font Server no arranque e ao desligar."
+msgstr "Inicia o Servidor X Font (essencial para o XFree funcionar)"
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
 "Escolha quais os servi�os que devem ser inicializados automaticamente na "
 "altura do arranque"
 
+#: ../../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 "Modo do sistema"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Op��es da impressora lpd Remota"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Base de Dados"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+msgid "Services"
+msgstr "Servi�os"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "a correr"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "parado"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Servi�os e dem�nios"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -6561,11 +7183,16 @@ msgstr ""
 "N�o h� informa��o adicional\n"
 "sobre este servi�o, lamento."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "Ao arrancar"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "A instalar pacote %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"
@@ -6573,15 +7200,66 @@ msgstr ""
 "Eu n�o consigo ler sua tabela de parti��es, � demasiado defeituosa\n"
 "para mim. Tentarei continuar limpando as parti��es defeituosas"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Erro"
+
+#: ../../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 "Configura��o p�s-instala��o"
+
+#: ../../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 "Configura��o do Estilo de Arranque"
+
+#: ../../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 "Parab�ns!"
+
+#: ../../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 "Partilha da Liga��o � Internet"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "A Partilha da Liga��o � Internet est� activa"
 
-#: ../../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"
@@ -6593,31 +7271,31 @@ msgstr ""
 "\n"
 "O que deseja fazer?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "desactivar"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "libertar"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "reconfigurar"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "A desactivar servidores..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Partilha da Liga��o � Internet est� agora desactivada."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "A Partilha da Liga��o � Internet est� actualmente desactivada"
 
-#: ../../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"
@@ -6629,28 +7307,19 @@ msgstr ""
 "\n"
 "O que deseja fazer?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "activar"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "A activar servidores..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Partilha da Liga��o � Internet est� agora activa."
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "O conte�do do ficheiro de configura��o n�o pode ser interpretado."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Ficheiro de configura��o desconhecido"
-
-#: ../../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 "
@@ -6659,27 +7328,29 @@ msgid ""
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
 "(LAN)."
 msgstr ""
-"Est�s prestes a configurar o seu computador para partilha a sua Liga��o � "
+"Est�s prestes a configurar o seu computador para partilhar a Liga��o � "
 "Internet.\n"
+"Com esta capacidade, outros computadores na sua rede local poder�o usar a "
+"liga��o � Internet deste computador\n"
 "\n"
 "Nota: necessita de um Adaptador de Rede dedicado para configurar uma Rede de "
 "�rea Local (LAN)."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interface %s (a usar m�dulo %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 "Nenhum adaptador de rede no seu 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."
@@ -6688,6 +7359,10 @@ msgstr ""
 "ferramenta de configura��o de hardware."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Interface de rede"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -6702,7 +7377,7 @@ msgstr ""
 "\n"
 "Estou prestes a configurar a sua Rede de �rea Local com esse adaptador."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -6710,22 +7385,23 @@ msgstr ""
 "Por favor escolha qual adaptador de rede que estar� ligado a sua Rede de "
 "�rea Local."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr "Aviso, o adaptador de rede j� est� configurado. Vou reconfigur�-lo."
 
-#: ../../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 ""
-"Potencial conflito de endere�os de LAN encontrado na configura��o actual de "
-"$_!\n"
+"Potencial conflito de endere�os de LAN encontrado na configura��o actual de %"
+"s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Configura��o de firewall detectada!"
 
-#: ../../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."
@@ -6733,23 +7409,20 @@ msgstr ""
 "Aviso! Uma configura��o de firewall existente foi detectada. Pode necessitar "
 "de configura��o manual depois da instala��o."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "A configurar..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "A configurar scripts, a instalar software, iniciando servidores..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Problemas a instalar o pacote $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Parab�ns!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Problemas a instalar o pacote %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 "
@@ -6759,25 +7432,24 @@ msgstr ""
 "Pode agora partilhar a sua Liga��o � Internet com outros computadores na sua "
 "Rede Local, usando a configura��o de rede autom�tica (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "A configura��o j� foi feita, mas est� actualmente desactivada."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "A configura��o j� foi feita, e est� actualmente activa."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Nenhuma Partilha da Liga��o � Internet foi alguma vez configurada."
 
-#: ../../standalone/drakgw_.c:615
-#, fuzzy
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
-msgstr "Liga��o e configura��o da Internet"
+msgstr "Configura��o da Partilha de Liga��o � Internet"
 
-#: ../../standalone/drakgw_.c:622
-#, fuzzy, c-format
+#: ../../standalone/drakgw_.c:631
+#, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
 "\n"
@@ -6789,86 +7461,84 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Clique em ``Ok'' se quer executar o Assistente de Configura��o."
+"Clique em Configurar para iniciar o assistente de configura��o."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Configura��o de Rede (%d adaptadores)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
-msgstr "Perfil:"
+msgstr "Perfil: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "Eliminar perfil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Perfil a eliminar:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Novo perfil..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Nome do perfil a criar:"
+#: ../../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 "Hostname: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Acesso Internet"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "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 "Estado:"
 
-#: ../../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 "Ligado"
 
-#: ../../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 "N�o ligado"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Ligar..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Desligar..."
 
-#: ../../standalone/draknet_.c:191
-#, fuzzy
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
-msgstr "A testar a sua liga��o..."
+msgstr "A iniciar a sua liga��o..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "A fechar a sua liga��o..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -6880,121 +7550,119 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "como root."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "O sistema est� agora desligado."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Configurar Acesso � Internet..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "Configura��o LAN"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adaptador"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Driver"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interface"
 
-#: ../../standalone/draknet_.c:231
-#, fuzzy
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Estado:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Configurar Rede de �rea Local."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Modo Normal"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Por favor aguarde... A aplicar a configura��o"
 
-#: ../../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�o tem nenhum interface configurado.\n"
+"Para configurar primeiro clique em 'Configurar'"
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "Configura��o 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 "Protocolo de Arranque"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Iniciado ao arrancar"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "Cliente DHCP"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Desactivar"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Activo"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Activar"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Activo"
 
-#: ../../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 ""
+"N�o tem nenhuma liga��o � Internet.\n"
+"Crie uma clicando em 'Configurar'"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Configura��o da Liga��o � Internet"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Configura��o da Liga��o � Internet"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Tipo de Liga��o:"
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Par�metros"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Provider dns 1 (opcional)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Provider dns 2 (opcional)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Placa Ethernet"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP Client"
 
@@ -7065,15 +7733,30 @@ msgstr ""
 "N�s definimos caracter�sticas n�vel 4, mas agora o sistema est� .\n"
 "totalmente fechado. As caracter�sticas de seguran�a est�o no m�ximo."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Op��es do n�vel de seguran�a"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Escolha as op��es para o 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 "Op��es do n�vel de seguran�a"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Centro de Controlo"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Escolha a ferramenta que deseja usar"
 
@@ -7102,90 +7785,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "N�o � poss�vel iniciar actualiza��o directa!!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "nenhum usb_s�rie encontrado\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Deseja emula��o de 3 bot�es?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Por favor teste o rato"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-#, fuzzy
-msgid "Network Monitoring"
-msgstr "Configura��o da Rede"
-
-#: ../../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 "Rato"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Connecting to Internet "
-msgstr "Ligar � Internet"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Disconnecting from Internet "
-msgstr "Desligar da Internet"
-
-#: ../../standalone/net_monitor_.c:114
-#, fuzzy
-msgid "Disconnection from Internet failed."
-msgstr "Desligar da Internet"
-
-#: ../../standalone/net_monitor_.c:115
-#, fuzzy
-msgid "Disconnection from Internet complete."
-msgstr "Desligar da Internet"
-
-#: ../../standalone/net_monitor_.c:117
-#, fuzzy
-msgid "Connection complete."
-msgstr "Nome da liga��o"
-
-#: ../../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 "Ligado"
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Disconnect"
-msgstr "Desligar..."
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Configura��o de firewalling"
@@ -7216,16 +7823,89 @@ msgstr ""
 "\n"
 "Clique em Configurar para configurar uma firewall padr�o"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Escolha a seu idioma"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Seleccione a classe da instala��o"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Detec��o de discos r�gidos"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Configurar rato"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Escolha o seu teclado"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Seguran�a"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Configurar sistemas de ficheiros"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formatar parti��es"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Escolha os pacotes a serem instalados"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Instalar sistema"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Adicionar um utilizador"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Configurar rede"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Configurar servi�os"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Criar um disco de arranque"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Instalar carregador de arranque"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Configurar X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Sair da instala��o"
+
+#: ../../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 ""
+"Configurador do tinyfirewall\n"
+"\n"
+"Configura uma firewall pessoal para esta m�quina Linux Mandrake.\n"
+"Para uma firewall poderosa e dedicada, por favor procure a \n"
+"distribui��o especializada 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"
@@ -7236,7 +7916,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"
@@ -7244,15 +7924,19 @@ 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"
 "answer no.\n"
 "\n"
 msgstr ""
+"Est� a correr um servidor de nomes nesta m�quina? Se n�o definiu \n"
+"um para enviar informa��es de IP e zona a toda a Internet por favor \n"
+"responda n�o.\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"
@@ -7260,24 +7944,37 @@ 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 ""
+"Deseja autorizar liga��es Secure Shell (ssh) recebidas do exterior? \n"
+"Isto � um substituto de telnet que pode utilizar para efectuar o login.\n"
+"Se estiver a utilizar telnet agora, deve mudar para ssh. telnet n�o � \n"
+"encriptado -- possibilitando o roubo da sua palavra-passe se o usar\n"
+"ssh � encriptado e n�o autoriza este '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 ""
+"Deseja autorizar liga��es telnet recebidas do exterior?\n"
+"Isto � muito inseguro, como j� explicamos. N�s recomendamos\n"
+"vivamente responder N�o aqui e usar ssh em vez de telnet.\n"
+"\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 ""
+"Est� a correr um servidor FTP aqui que necessita que esteja acess�vel na\n"
+"Internet? Se estiver, recomendamos que apenas o utilize para transfer�ncias\n"
+"An�nimas. Quaisquer palavras-passe enviadas por FTP podem ser roubadas,\n"
+" uma vez que o FTP tamb�m n�o utiliza encripta��o para palavras-passe.\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"
@@ -7290,7 +7987,7 @@ msgstr ""
 "o firewall para isto.\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"
@@ -7302,7 +7999,7 @@ msgstr ""
 "para pessoas via esta m�quina.\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"
@@ -7314,7 +8011,7 @@ msgstr ""
 "casa ou escrit�rio (dinamicamente atribu�do), necessitamos \n"
 "permitir isto. � este o caso?\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"
@@ -7328,7 +8025,7 @@ msgstr ""
 "de um grande escrit�rio e nunca ouviu falar disto, provavelmente n�o \n"
 "estar�."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -7340,362 +8037,446 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
-#, fuzzy, c-format
+#: ../../tinyfirewall.pm_.c:82
+#, c-format
 msgid "Can't open %s: %s\n"
-msgstr "Adaptador %s: %s"
+msgstr "N�o � poss�vel abrir %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 "Erro ao abrir %s para escrita: %s"
-
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clientes para diferentes protocolos incluindo ssh"
-
-#: ../../share/compssUsers:999
-msgid "Development"
-msgstr ""
-
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Workstation"
-msgstr "Esta��o de Trabalho KDE"
+msgstr "N�o � poss�vel abrir %s para escrita: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Gest�o de Informa��es Pessoais"
+msgid "Network Computer (client)"
+msgstr "Computador de Rede (cliente)"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multim�dia - Gr�ficos"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Office"
+msgstr "Escrit�rio"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computador de Rede (cliente)"
+msgid "Gnome Workstation"
+msgstr "Esta��o de Trabalho Gnome"
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Ferramentas para audio: reprodutores mp3 ou midi, misturadores, etc"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Ferramentas para o seu Palm Pilot ou Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Esta��o de Internet"
+msgid "Workstation"
+msgstr "Esta��o de Trabalho"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Escrit�rio"
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Esta��o Multim�dia"
+msgid "Domain Name and Network Information Server"
+msgstr "Servidor de Nome do Dom�nio e Informa��o de Rede"
 
 #: ../../share/compssUsers:999
 msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Conjunto de ferramentas para ler e enviar correio electr�nico e news (pine, "
-"mutt, tin...) e para navegar na Web"
-
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"C e C++ bibliotecas de desenvolvimento, programas e ficheiros 'include'"
+"Programas de Escrit�rio: texto (kword, abiword), folhas de c�lculo (kspread, "
+"gnumeric), visualizadores pdf, etc"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Ferramentas para audio: reprodutores mp3 ou midi, misturadores, etc"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programas para gerir as suas finan�as, como o gnucash"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livros e Howto's sobre o Linux e Software Livre"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "KDE Workstation"
+msgstr "Esta��o de Trabalho KDE"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documenta��o"
+msgid "Multimedia - Video"
+msgstr "Multim�dia - V�deo"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Conjunto de ferramentas para correio electr�nico, news, web, transfer�ncia "
+"de ficheiros e chat"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Utilit�rios"
+msgid "Database"
+msgstr "Base de Dados"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de Bases de Dados PostgreSQL ou MySQL"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr ""
+msgid "Tools to ease the configuration of your computer"
+msgstr "Ferramentas para facilitar a configura��o do seu computador"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia - Sound"
 msgstr "Multim�dia - Som"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de divertimento: arcade, tabuleiros, estrat�gia, etc"
+msgid "Utilities"
+msgstr "Utilit�rios"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Reprodutores de V�deo e editores"
+msgid "Documentation"
+msgstr "Documenta��o"
 
 #: ../../share/compssUsers:999
 msgid "Console Tools"
 msgstr "Ferramentas de terminal"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Aplica��es de som e v�deo reprodu��o/edi��o"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix servidor de correio, Inn servidor de news "
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Esta��o de Trabalho Cient�fica"
+msgid "Internet station"
+msgstr "Esta��o de Internet"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, linhas de comando, ferramentas de ficheiro, terminais"
+msgid "Multimedia station"
+msgstr "Esta��o Multim�dia"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livros e Howto's sobre o Linux e Software Livre"
+msgid "Configuration"
+msgstr "Configura��o"
+
+#: ../../share/compssUsers:999
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Mais Ambientes de Trabalho Gr�ficos (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 ""
-"Um ambiente gr�fico com um conjunto de aplica��es e ferramentas de ambiente "
-"de trabalho f�ceis de usar"
+"The K Desktop Environment, o ambiente gr�fico b�sico com a colec��o de "
+"ferramentas que o acompanham"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Graphical Environment"
+msgstr "Ambiente Gr�fico"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Jogos"
+msgid "Development"
+msgstr "Desenvolvimento"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multim�dia - V�deo"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache e Pro-ftpd"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "Computador de Rede Servidor de Ficheiros"
+msgid "Tools to create and burn CD's"
+msgstr "Ferramentas para criar e gravar CD"
+
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Esta��o de Trabalho de Escrit�rio"
+
+#: ../../share/compssUsers:999
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 #: ../../share/compssUsers:999
 msgid "Graphics programs such as The Gimp"
 msgstr "Aplica��es para gr�ficos como o The Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Esta��o de Trabalho de Escrit�rio"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "C and C++ development libraries, programs and include files"
 msgstr ""
-"The K Desktop Environment, o ambiente gr�fico b�sico com a colec��o de "
-"ferramentas que o acompanham"
+"C e C++ bibliotecas de desenvolvimento, programas e ficheiros 'include'"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Mais Ambientes de Trabalho Gr�ficos (Gnome, IceWM)"
+msgid "Network Computer server"
+msgstr "Computador de Rede Servidor"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Ferramentas para criar e gravar CD"
+msgid "Mail/Groupware/News"
+msgstr "Mail/Groupware/News"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multim�dia - Grava��o de CDs"
+msgid "Game station"
+msgstr "Esta��o de Jogo"
 
 #: ../../share/compssUsers:999
-msgid "Archiving, emulators, monitoring"
-msgstr "Arquivo, emuladores, monitoriza��o"
+msgid "Video players and editors"
+msgstr "Reprodutores de V�deo e editores"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de Dados"
+msgid "Multimedia - Graphics"
+msgstr "Multim�dia - Gr�ficos"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Programas de Escrit�rio: texto (kword, abiword), folhas de c�lculo (kspread, "
-"gnumeric), visualizadores pdf, etc"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programas de divertimento: arcade, tabuleiros, estrat�gia, etc"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Conjunto de ferramentas para ler e enviar correio electr�nico e news (pine, "
+"mutt, tin...) e para navegar na Web"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Server"
-msgstr "servidor"
+msgid "Archiving, emulators, monitoring"
+msgstr "Arquivo, emuladores, monitoriza��o"
 
 #: ../../share/compssUsers:999
 msgid "Personal Finance"
 msgstr "Finan�as Pessoais"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configura��o"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Esta��o de Trabalho KDE"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Um ambiente gr�fico com um conjunto de aplica��es e ferramentas de ambiente "
+"de trabalho f�ceis de usar"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Outros Ambientes de Trabalho Gr�ficos"
+msgid "Clients for different protocols including ssh"
+msgstr "Clientes para diferentes protocolos incluindo ssh"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache e Pro-ftpd"
+msgid "Internet gateway"
+msgstr "Gateway Internet"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Mail/Groupware/News"
+msgid "Sound and video playing/editing programs"
+msgstr "Aplica��es de som e v�deo reprodu��o/edi��o"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Esta��o de Trabalho Gnome"
+msgid "Other Graphical Desktops"
+msgstr "Outros Ambientes de Trabalho Gr�ficos"
 
 #: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Acesso Internet"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editores, linhas de comando, ferramentas de ficheiro, terminais"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Ferramentas para o seu Palm Pilot ou Visor"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programas para gerir as suas finan�as, como o gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Esta��o de Jogo"
+msgid "Games"
+msgstr "Jogos"
 
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Personal Information Management"
+msgstr "Gest�o de Informa��es Pessoais"
 
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Ferramentas para facilitar a configura��o do seu computador"
+msgid "Multimedia - CD Burning"
+msgstr "Multim�dia - Grava��o de CDs"
 
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Conjunto de ferramentas para correio electr�nico, news, web, transfer�ncia "
-"de ficheiros e chat"
-
-#~ msgid "GB"
-#~ msgstr "GB"
+msgid "Scientific Workstation"
+msgstr "Esta��o de Trabalho Cient�fica"
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "n�o poss�vel abrir /etc/sysconfig/autologin para leitura: %s"
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Deseja reiniciar a rede"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minutos"
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Concorda?"
 
-#~ msgid "1 minute"
-#~ msgstr "1 minuto"
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Estou pronto a reiniciar o dispositivo de rede:\n"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d segundos"
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Estou pronto para reiniciar o dispositivo de rede %s. Concorda?"
 
 #, fuzzy
-#~ msgid "Lilo/Grub configuration"
-#~ msgstr "Configura��o LAN"
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Aqui est�o as seguintes filas de impress�o.\n"
+#~ "Pode adicionar mais ou modificar as existentes."
 
-#~ msgid "Selected size %d%s"
-#~ msgstr "Tamanho seleccionado %d%s"
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Tipo de Liga��o:"
 
-#~ msgid "Opening your connection..."
-#~ msgstr "A abrir a sua liga��o..."
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Escolha o utilizador por omiss�o :"
 
-#~ msgid "Configure..."
-#~ msgstr "Configurar..."
+#~ msgid "Test the mouse here."
+#~ msgstr "Teste aqui o rato."
 
-#~ msgid "Standard tools"
-#~ msgstr "Ferramentas padr�o"
+#~ msgid "What type of printer do you have?"
+#~ msgstr "Qual tipo de impressora que tem?"
 
-#, fuzzy
-#~ msgid "Configuration de Lilo/Grub"
-#~ msgstr "Configura��o"
+#~ msgid "Do you want to test printing?"
+#~ msgstr "Quer testar a impress�o?"
 
-#~ msgid "This startup script try to load your modules for your usb mouse."
-#~ msgstr "Esse script de inicializa��o carrega os m�dulos do seu rato usb."
+#~ 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 ""
+#~ "Agora pode testar seu rato. Use os bot�es e a roda para\n"
+#~ "verificar se as configura��es est�o correctas. Se n�o estiverem, pode "
+#~ "clicar\n"
+#~ "em \"Cancelar\" e escolher outro driver."
 
-#~ msgid "Boot style configuration"
-#~ msgstr "Configura��o do estilo do arranque"
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Para ter um sistema mais seguro, deve escolher \"Usar ficheiro shadow\"\n"
+#~ "e \"Usar senhas MD5\"."
 
 #~ 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"
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
 #~ msgstr ""
-#~ "Agora que sua liga��o � Internet est� configurada, o seu \n"
-#~ "computador pode ser configurado para partilhar a sua liga��o � Internet.\n"
-#~ "Nota: precisa de Adaptador de Rede dedicado para configurar uma Rede "
-#~ "Local (LAN).\n"
-#~ "\n"
-#~ "Deseja configurar a Partilha de Liga��o � Internet?\n"
+#~ "Se a sua rede usa NIS, seleccione \"Usar NIS\". Se n�o sabe, pergunte\n"
+#~ "ao seu administrador de rede."
 
-#, fuzzy
-#~ msgid "Welcome to the Internet Connection Sharing utility!"
-#~ msgstr "Partilha da Liga��o � Internet"
+#~ msgid "yellow pages"
+#~ msgstr "p�ginas amarelas"
 
-#~ msgid "Automatic dependencies"
-#~ msgstr "Depend�ncias autom�ticas"
+#~ msgid "Light configuration"
+#~ msgstr "Configura��o leve"
 
-#~ msgid "Configure LILO/GRUB"
-#~ msgstr "Configurar LILO/GRUB"
+#~ msgid "Provider dns 1"
+#~ msgstr "DNS 1 do provedor"
 
-#~ msgid "Create a boot floppy"
-#~ msgstr "Criar uma disquete de arranque"
+#~ msgid "Provider dns 2"
+#~ msgstr "DNS 2 do provedor"
 
-#~ msgid "Format floppy"
-#~ msgstr "Formatar disquete"
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "Liga��o DSL (ou ADSL)"
 
-#~ msgid "Choice"
+#~ msgid "Choose"
 #~ msgstr "Escolha"
 
-#~ msgid "horizontal nice looking aurora"
-#~ msgstr "aurora bonito na horizontal"
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr ""
+#~ "Voc� pode directamente especificar o URI para aceder � impressora com CUPS"
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Sim, imprimir p�gina de teste ASCII"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Sim, imprimir p�gina de teste PostScript"
+
+#~ msgid "Yes, print both test pages"
+#~ msgstr "Sim, imprimir ambas as p�ginas de teste"
+
+#~ msgid "Paper Size"
+#~ msgstr "Tamanho do Papel"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Ejectar p�gina ap�s trabalho de impress�o?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Op��es do driver Uniprint"
+
+#~ msgid "Color depth options"
+#~ msgstr "Op��es da profundidade de cor"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Imprimir texto como PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Corrigir texto com stair-stepping?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "N�mero de p�ginas por p�ginas de sa�da"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Margem Direita/Esquerda em pontos (1/72 de polegada)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Margem Superior/Inferior em pontos (1/72 de polegada)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Op��es extras de GhostScript"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Op��es extras de Texto"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Inverter a ordem das p�ginas"
+
+#~ msgid "CUPS starting"
+#~ msgstr "A iniciar o CUPS"
+
+#~ msgid "Reading CUPS drivers database..."
+#~ msgstr "Lendo banco de dados de drivers do CUPS"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Seleccionar liga��o de impressora remota"
+
+#~ 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 ""
+#~ "Com um servidor CUPS remoto, n�o tem que configurar\n"
+#~ "nenhuma impressora aqui; elas ser�o detectadas automaticamente.\n"
+#~ "Se tiver d�vidas, seleccione \"Servidor CUPS remoto\"."
+
+#~ 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 precisa de um nome (por exemplo\n"
+#~ "lp). Outros par�metros, tal como a descri��o da impressora ou sua\n"
+#~ "localiza��o podem ser definidas. Qual nome que deve ser usado para \n"
+#~ " esta impressora e como a impressora est� ligada?"
+
+#~ 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 fila de impress�o (� qual as impress�es s�o dirigidas) precisa\n"
+#~ "de um nome (normalmente lp) e de uma directoria de spool associada.\n"
+#~ "Qual o nome e a directoria que devem ser utilizados para esta fila?"
 
-#~ msgid "vertical traditional aurora"
-#~ msgstr "aurora tradicional na vertical"
+#~ msgid "Name of queue"
+#~ msgstr "Nome da fila de impress�o"
 
-#~ msgid "gMonitor"
-#~ msgstr "gMonitor"
+#~ msgid "Spool directory"
+#~ msgstr "Directoria de spool"
diff --git a/perl-install/share/po/pt_BR.po b/perl-install/share/po/pt_BR.po
index 224e4cfca..f580c552f 100644
--- a/perl-install/share/po/pt_BR.po
+++ b/perl-install/share/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\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-27 21:00GMT-0300\n"
 "Last-Translator: Andrei Bosco Bezerra Torres <andreibt@uol.com.br>\n"
 "Language-Team: Portugu�s Brasileiro <andreibt@uol.com.br>\n"
@@ -14,24 +14,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 "Configurar todas as cabe�as independentemente"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Usar extens�o Xinerama"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Configurar apenas placa \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Configura��o multi-cabe�a"
 
-#: ../../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 ""
 "Seu sistema suporta configura��o de cabe�a m�ltipla.\n"
 "O que voc� quer fazer?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Placa Gr�fica"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Selecione uma placa gr�fica"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Escolha um 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 "Qual configura��o do XFree voc� quer ter?"
 
-#: ../../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 ""
 "Seu placa suporta acelera��o hardware 3D mas apenas com o XFree %s.\n"
 "Sua placa � suportada pelo XFree %s que pode ter melhor suporte 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 "Sua placa suporta acelera��o hardware 3D com o 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 com acelera��o hardware 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"
@@ -93,12 +94,12 @@ msgstr ""
 "Seu placa suporta acelera��o hardware 3D com o XFree %s,\n"
 "NOTE QUE O SUPORTE � EXPERIMENTAL E PODE TRAVAR O SEU COMPUTADOR."
 
-#: ../../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 com acelera��o hardware 3D 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"
@@ -109,27 +110,31 @@ msgstr ""
 "NOTE QUE O SUPORTE � EXPERIMENTAL E PODE TRAVAR O SEU COMPUTADOR.\n"
 "Sua placa � suportada pelo XFree %s que pode ter melhor suporte 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "Configura��o do XFree"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Selecione o tamanho da mem�ria de sua placa gr�fica"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Escolha as op��es do server"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Escolha um 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"
@@ -152,39 +157,39 @@ msgstr ""
 "monitor.\n"
 " Se tiver d�vida, escolha caracter�sticas conservadoras."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Taxa de atualiza��o horizontal"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Taxa de atualiza��o vertical"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Monitor n�o configurado"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Placa gr�fica ainda n�o configurado"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Resolu��es ainda n�o escolhidas"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Voc� quer testar a configura��o?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Aten��o: testar essa placa gr�fica pode travar o seu computador"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Testar configura��o"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -192,152 +197,156 @@ msgstr ""
 "\n"
 "tente mudar alguns par�metros"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Ocorreu um erro:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Saindo em %d segundos"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "� essa a configura��o correta?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Ocorreu um erro, tente mudar alguns par�metros"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Resolu��o"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Escolha a resolu��o e n�mero de cores"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Placa Gr�fica: %s"
 
-#: ../../Xconfigurator.pm_.c:734
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "Server 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 "Modo Avan�ado"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Mostrar tudo"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Resolu��es"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Estilo do teclado: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo do Mouse: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Dispositivo do mouse: %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 "Sincroniza��o Horizontal do Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Atualiza��o Vertical do Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Placa Gr�fica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Placa 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 "N�mero de cores: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolu��o: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1342
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "Server XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1343
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "Driver XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Preparando configura��o X-Window"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "O que voc� quer fazer?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Mudar Monitor"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Mudar Placa Gr�fica"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Mudar op��es do Server"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Mudar Resolu��o"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Mostrar informa��o"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Testar de novo"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Sair"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -350,21 +359,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Favor relogar em %s para ativar as mudan�as"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
 "Favor fazer um log out (sair) e ent�o usar as teclas Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X ao iniciar"
 
-#: ../../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?"
@@ -417,214 +426,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 ou mais"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "VGA Padr�o, 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 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "Compat�vel com 8514, 1024x768 a 87 Hz entrela�ado (sem 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 entrela�ado, 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 Extendido, 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 N�o-entrela�ado, 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 de Alta Frequ�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-frequ�ncia que pode fazer 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-frequ�ncia que pode fazer 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-frequ�ncia que pode fazer 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 pode fazer 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 pode fazer 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 "Primeiro setor da parti��o de boot"
 
-#: ../../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 "Primeiro setor do drive (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "Instala��o do 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 "Onde voc� quer instalar o gerenciador de inicializa��o?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "Instala��o do 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 com menu de texto"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO com menu gr�fico"
 
-#: ../../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 "Inicializa��o pelo 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 "Principais op��es do gerenciador de inicializa��o"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Gerenciador de inicializa��o a ser usado"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Instala��o do gerenciador de inicializa��o"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Dispositivo de boot"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (n�o funciona em BIOS antigas)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Compacto"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "Compacto"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Modo de V�deo"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Tempo antes de entrar na imagem padr�o"
 
-#: ../../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 "Senha"
 
-#: ../../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 "Senha (de novo)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Restringir op��es da linha de comando"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "restrito"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Limpar /tmp a cada inicializa��o"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Especifique o tamanho da RAM se necess�rio (%d MB encontrados)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Permitir v�rios perfis"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Dar o tamanha da RAM em Mb"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "Op��o ``Restringir op��es da linha de comando'' n�o tem uso sem senha"
 
-#: ../../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 "Favor tentar novamente"
 
-#: ../../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 "As senhas n�o conferem"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Mensagem Inicial"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Delay do firmware aberto"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Tempo de espera do boot do kernel"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Permitir CD Boot?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Permitir OF Boot?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "SO padr�o?"
 
-#: ../../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."
@@ -632,145 +652,144 @@ msgstr ""
 "Aqui est�o as entradas diferentes.\n"
 "Voc� pode adicionar mais ou modificar as existentes."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../../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 "Pronto"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Qual tipo de entrada voc� quer adicionar"
 
-#: ../../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 "Outros SO (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Outros SO (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Outros SO (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 "Table"
 
-#: ../../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 "R�tulo"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Default"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Tamanho do Initrd"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "Sem v�deo"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Remover entrada"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "N�o � permitido r�tulo vazio"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Esse r�tulo j� est� sendo utilizado"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Qual tipo de particionamento?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Interfaces %s %s encontradas"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Voc� tem alguma outra?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Voc� tem alguma interface %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 "N�o"
 
-#: ../../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 "Sim"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Ver informa��o do hardware"
 
 #. -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 "Instalando driver para placa %s %s"
 
-#: ../../any.pm_.c:649
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(m�dulo %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 "Qual driver %s eu deveria tentar?"
 
-#: ../../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"
@@ -787,20 +806,20 @@ msgstr ""
 "m�quina as informa��es que ele precisa? Ocasionalmente, isso poder� travar\n"
 "o computador, mas n�o deve causar nenhum dano."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Auto detectar"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Especificar op��es"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Agora voc� poder prover as op��es para o m�dulo %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -811,11 +830,11 @@ msgstr ""
 "As op��es est�o no formato ``nome=valor nome2=valor2 ...''\n"
 "Para inst�ncia, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Op��es do m�dulo:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -824,34 +843,34 @@ msgstr ""
 "Falha carregando m�dulo %s.\n"
 "Voc� quer tentar novamente com outros par�mentros?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(j� adicionado %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Essa senha � muito simples"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Favor dar um nome de usu�rio"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "O nome do usu�rio deve conter apenas letras min�sculas, n�meros `-' e `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Esse usu�rio j� foi adicionado"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Adicionar usu�rio"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -860,54 +879,68 @@ msgstr ""
 "Entre com o usu�rio\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Aceitar usu�rio"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Nome 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 "Nome do usu�rio"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "�cone"
 
-#: ../../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 ""
 "Eu posso configurar o seu computador para automaticamente logar um usu�rio.\n"
 "Se voc� n�o quiser utilisar esta fun��o, clique em \"Cancelar\"."
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Escolha o usu�rio:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Escolha o gerenciador de janelas para ele:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Favor escolher o idioma a ser utilizado."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr ""
+"Voc� pode escolher outros idiomas que estar�o dispon�veis ap�s a instala��o"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Tudo"
+
 # 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"
@@ -932,53 +965,58 @@ 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 "Bem-vindo ao GRUB o selecionador de sistema operacional!"
 
 #. -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 as teclas %c e %c para selecionar a entrada que quiser."
 
 #. -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 "Pressione entrar para entrar no SO selecionado, 'e' para editar os"
 
 #. -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 "comandos antes da inicializacao, ou 'c' para linha de comando."
 
 #. -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 ""
 "A inicializacao da entrada selecionada ocorrera automaticamente em %d "
 "segundos."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "sem espaco suficiente em /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 "Menu Iniciar"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Onde voc� quer instalar o gerenciador de inicializa��o?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "ajuda ainda n�o implementada.\n"
@@ -991,522 +1029,701 @@ msgstr "Configura��o do estilo de inicializa��o"
 msgid "/_File"
 msgstr "/_Arquivos"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Arquivo/_Novo"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>A"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Arquivo/_Abrir"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>A"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Arquivo/_Salvar"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Arquivo/Salvar _Como"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Arquivo/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Arquivo/Sai_r"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>R"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Op��es"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Op��es/Teste"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/Aj_uda"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Ajuda/_Sobre"
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../../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 ""
-"Voc�  est� utilizando o %s como gerenciador de inicializa��o.\n"
-"Clique em Configurar para abrir o auxiliar de configura��o."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Modo lilo/grub"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "Categorizamento NewStyle de Monitor"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "Monitor NewStyle"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "Monitor Tradicional"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "Monitor Gtk+ Tradicional"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "Executar Aurora na inicializa��o"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Modo lilo/grub"
+
+#: ../../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 ""
+"Voc�  est� utilizando o %s como gerenciador de inicializa��o.\n"
+"Clique em Configurar para abrir o auxiliar de configura��o."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Configurar"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Modo de inicializa��o"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Modo do sistema"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "Executar o sistema X-Window na inicializa��o"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "N�o, eu n�o quero autologin"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Sim, eu quero autologin com esse (usu�rio, desktop)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Modo do sistema"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Default"
-
-#: ../../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 "Cancelar"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "n�o foi poss�vek abrir /etc/inittb para leitura: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "n�o foi poss�vel abrir /etc/sysconfig/autologin para leitura: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "n�o foi poss�vek abrir /etc/inittb para leitura: %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 "A Instala��o do LILO falhou. Ocorreram os seguintes erros:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Criar"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Desmontar"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Deletar"
+#: ../../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 "Formatar"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "Redimensionar"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutos"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Tipo"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minuto"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Ponto de Montagem"
-
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Gravar /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d segundos"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Mudar para modo expert"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Favor primeiro fazer um backup de seus dados"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Mudar para modo normal"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "Ler com aten��o!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Restaurar do arquivo"
+#: ../../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 voc� planejar usar aboot, lembre-se de deixar espa�o livre (2048 setores "
+"� suficiente)\n"
+"no in�cio do disco"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Salvar no arquivo"
+#: ../../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 "Erro"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Ajudante"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Restaurar do disquete"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Novo"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Salvar em disquete"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Fila remota"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Limpar tudo"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Ponto de Montagem"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Formatar tudo"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Op��es"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Auto alocar"
+#: ../../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 "Todas as parti��es prim�rias est�o sendo usadas"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Desmontar"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Eu n�o posso adicionar mais nenhuma parti��o"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Montar"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Escolher a��o"
+
+#: ../../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 ""
-"Para ter mais parti��es, favor deletar uma para poder criar uma parti��o "
-"extendida"
+"Voc� tem uma grande parti��o fat\n"
+"(normalmente utilizada pelo MicroSoft Dos/Windows.)\n"
+"Eu sugiro voc� a primeiro redimensionar a parti��o\n"
+"(clique nela, depois clique em \"Redimensinar\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Sem espa�o livre suficiente para auto-aloca��o"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Favor clicar em uma parti��o"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Desfazer"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Favor clicar em uma parti��o"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Gravar tabela de parti��o"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Favor clicar em uma parti��o"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Mais"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detalhes"
 
-#: ../../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 "falhou ao montar"
+
+#: ../../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 "Vazio"
 
-#: ../../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 "Outro"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Tipos de sistema de arquivo:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detalhes"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Criar"
+
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Use ``%s'' ao inv�s"
+
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Deletar"
+
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Use ``Desmontar'' primeiro"
 
-#: ../../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 ""
-"Voc� tem uma grande parti��o fat\n"
-"(normalmente utilizada pelo MicroSoft Dos/Windows.)\n"
-"Eu sugiro voc� a primeiro redimensionar a parti��o\n"
-"(clique nela, depois clique em \"Redimensinar\")"
+"Ap�s alterar o tipo da parti��o %s, todos os dados desta parti��o ser�o "
+"perdidos"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Favor primeiro fazer um backup de seus dados"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Onde voc� quer montar o dispositivo %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 "Ler com aten��o!"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Op��es do m�dulo:"
 
-#: ../../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 voc� planejar usar aboot, lembre-se de deixar espa�o livre (2048 setores "
-"� suficiente)\n"
-"no in�cio do disco"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Tenha cuidade: essa opera��o � perigosa."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "Auto-montagem da m�dia remov�vel"
 
-#: ../../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 "Erro"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Mudar tipo de parti��o"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Ponto de montagem: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Qual sistema de arquivos voc� quer?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Dispositivo: "
+#: ../../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 "Letra do drive no DOS: %s (apena um palpite)\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 "Tipo: "
+#: ../../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 "Nome: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "servidor"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Iniciar: setor: %s\n"
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Tamanho: %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 setores"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Cilindro %d ao cilindro %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Escolher a��o"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Formatado\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Criar uma nova parti��o"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "N�o formatado\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Montado\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Mudar para modo 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 "Mudar para modo normal"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Arquivo(s) loopback: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Desfazer"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Parti��o de inicializa��o padr�o\n"
-"    (para inicializa��o do MS-DOS, n�o para o lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Continuar mesmo assim?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "N�vel %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Sair sem salvar"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Tamanho do bloco %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Sair sem gravar na tabela de parti��o?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "Discos RAID %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Voc� quer testar a configura��o?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Nome do arquivo loopback: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Auto alocar"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Limpar tudo"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Mais"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Detec��o de discos rigidos"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Sem espa�o livre suficiente para auto-aloca��o"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Todas as parti��es prim�rias est�o sendo usadas"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Eu n�o posso adicionar mais nenhuma parti��o"
+
+#: ../../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"
-"� prov�vel que est� parti��o seja uma\n"
-"parti��o Driver, voc� provavelmente\n"
-"n�o deveria mexer nela.\n"
+"Para ter mais parti��es, favor deletar uma para poder criar uma parti��o "
+"extendida"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Gravar tabela de parti��o"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Recuperar tabela de parti��o"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Recuperar tabela de parti��o"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Recuperar tabela de parti��o"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Auto-montagem da m�dia remov�vel"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Selecione arquivo"
+
+#: ../../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"
-"Essa parti��o especial\n"
-"Bootstrap � para o\n"
-"boot-duplo do seu sistema.\n"
+"O backup da tabela de parti��o n�o tem o mesmo tamanho\n"
+"Ainda continuar?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Favor clicar em uma parti��o"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Aviso"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Tamanho: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Insira um disquete no drive\n"
+"Todos os dados no disquete ser�o perdidos"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometria: %s cilindros, %s cabe�as, %s setores\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Tentando resgatar tabela de parti��o"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "Discos LVM %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Mostrar informa��o"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Tipo da tabela de parti��o: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Redimensionar"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "no barramento %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Mover"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Montar"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatar"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Ativo"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Adicionar ao RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Remover do RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Modificar RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Adicionar ao LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Remover do RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Remover do LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Modificar RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Usar para loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Escolher a��o"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Criar uma nova parti��o"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Setor inicial: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Tamanho em MB: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Tipo do Sistema de Arquivos: "
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Ponto de montagem: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Prefer�ncia: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Formatando arquivo loopback %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Mudar tipo de parti��o"
+
+#: ../../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 "Onde voc� quer montar o arquivo loopback %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 ""
+"N�o posso desmacar o ponto de montagem enquanto a parti��o for\n"
+"usada para loop back. Remova o loopback primeiro"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Computando limites do sistema de arquivo fat"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Redimensionando"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Esta parti��o n�o � redimension�vel"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Voc� deveria fazer backup de todos os dados desta parti��o"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"Ap�s redimensionar a partic�o %s, todos os dados da parti��o ser�o perdidos"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Escolha o novo tamanho"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Tamanho em MB: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Qual disco voc� quer mover?"
+
+#: ../../diskdrake_interactive.pm_.c:632
+msgid "Sector"
+msgstr "Setor"
+
+#: ../../diskdrake_interactive.pm_.c:633
+msgid "Which sector do you want to move it to?"
+msgstr "Qual setor voc� quer mover?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Movendo"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Movendo parti��o..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Escolha um RAID existente para adicionar"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "novo"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Escolha um LVM existente para adicionar"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "Nome LVM?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Essa parti��o n�o pode ser usada para loopback"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Nome do arquivo loopback: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Nome real"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "Arquivo j� utilizado por outro loopback, escolha outro"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Arquivo j� existe. Utiliz�-lo?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "dispositivo"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "n�vel"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "tamanho do bloco"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Tenha cuidade: essa opera��o � perigosa."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Qual tipo de particionamento?"
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1518,7 +1735,7 @@ msgstr ""
 "Ou voc� usa LILO e ele n�o funcionar�, ou voc� n�o usar� LILO e voc� n�o "
 "precisar� de /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"
@@ -1531,7 +1748,7 @@ msgstr ""
 "Se voc� quer usar o gerenciador de inicializa��o LILO, n�o esque�a "
 "deadicionar uma parti��o /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"
@@ -1541,282 +1758,241 @@ msgstr ""
 "O gerenciador de inicializa��o n�o consegue acess�-lo sem uma\n"
 "parti��o /boot. Ent�o n�o esque�a de adicion�-la"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Use ``%s'' ao inv�s"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Use ``Desmontar'' primeiro"
-
-#: ../../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 ""
-"Ap�s alterar o tipo da parti��o %s, todos os dados desta parti��o ser�o "
-"perdidos"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Continuar mesmo assim?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Sair sem salvar"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Sair sem gravar na tabela de parti��o?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Mudar tipo de parti��o"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Qual sistema de arquivos voc� quer?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Voc� n�o pode usar ReiserFS em parti��es menores que 32MB"
-
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Onde voc� quer montar o arquivo loopback %s?"
-
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Onde voc� quer montar o dispositivo %s?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "A tabela de parti��o do drive %s est� para ser gravada no disco!"
 
-#: ../../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�o posso desmacar o ponto de montagem enquanto a parti��o for\n"
-"usada para loop back. Remova o loopback primeiro"
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Voc� precisar� reiniciar antes que as modifica��es tenham efeito"
 
-#: ../../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 ""
 "Ap�s formatar a parti��o %s, todos os dados desta parti��o ser�o perdidos"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Formatando"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatando arquivo 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 "Formatando parti��o %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Ap�s formatar todas as parti��es,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "todos os dados nessas parti��es ser�o perdidos"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Mover"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Qual disco voc� quer mover?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Setor"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid falhou"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Qual setor voc� quer mover?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Sem espa�o livre suficiente para alocar as novas parti��es"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Movendo"
+#: ../../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 "Movendo parti��o..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Sem espa�o livre suficiente para alocar as novas parti��es"
 
-#: ../../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 "A tabela de parti��o do drive %s est� para ser gravada no disco!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Voc� precisar� reiniciar antes que as modifica��es tenham efeito"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Resolu��o: %s\n"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Computando limites do sistema de arquivo fat"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Dispositivo: "
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Redimensionando"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "Letra do drive no DOS: %s (apena um palpite)\n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Esta parti��o n�o � redimension�vel"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Tipo: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Voc� deveria fazer backup de todos os dados desta parti��o"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Nome: "
 
-#: ../../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 ""
-"Ap�s redimensionar a partic�o %s, todos os dados da parti��o ser�o perdidos"
+msgid "Start: sector %s\n"
+msgstr "Iniciar: setor: %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Escolha o novo tamanho"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Tamanho: %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 setores"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Criar uma nova parti��o"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Cilindro %d ao cilindro %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Setor inicial: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Formatado\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Tamanho em MB: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "N�o formatado\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Tipo do Sistema de Arquivos: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Montado\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 "Essa parti��o n�o pode ser usada para loopback"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Arquivo(s) 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 ""
+"Parti��o de inicializa��o padr�o\n"
+"    (para inicializa��o do MS-DOS, n�o para o lilo)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Nome do arquivo loopback: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "N�vel %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "Arquivo j� utilizado por outro loopback, escolha outro"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Tamanho do bloco %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Arquivo j� existe. Utiliz�-lo?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "Discos RAID %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Selecione arquivo"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Nome do arquivo 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 ""
-"O backup da tabela de parti��o n�o tem o mesmo tamanho\n"
-"Ainda continuar?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Aviso"
+"\n"
+"� prov�vel que est� parti��o seja uma\n"
+"parti��o Driver, voc� provavelmente\n"
+"n�o deveria mexer nela.\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 ""
-"Insira um disquete no drive\n"
-"Todos os dados no disquete ser�o perdidos"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Tentando resgatar tabela de parti��o"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "dispositivo"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "n�vel"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "tamanho do bloco"
+"\n"
+"Essa parti��o especial\n"
+"Bootstrap � para o\n"
+"boot-duplo do seu sistema.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Escolha um RAID existente para adicionar"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Tamanho: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "novo"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometria: %s cilindros, %s cabe�as, %s setores\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Escolha um LVM existente para adicionar"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Informa��o: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "Nome LVM?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "Discos LVM %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Auto-montagem da m�dia remov�vel"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Tipo da tabela de parti��o: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Recuperar tabela de parti��o"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "no barramento %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Atualizar"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Op��es: %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 formata��o de %s falhou"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Eu n�o sei como formatar %s no tipo %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "falhou ao montar"
+
+#: ../../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 "falhou ao montar: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "erro desmontando %s: %s"
@@ -1829,41 +2005,44 @@ msgstr "simples"
 msgid "server"
 msgstr "servidor"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Voc� n�o pode usar JFS em parti��es menores que 16MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Voc� n�o pode usar ReiserFS em parti��es menores que 32MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Pontos de montagem devem come�ar com uma /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "J� existe uma parti��o no ponto de montagem %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Monts circulares %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 "Voc� n�o pode usar um Volume L�givo LVM para o ponto de montagem %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Esse diret�rio deveria permanecer dentro do sistema de arquivo root"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Voc� precisa de um verdadeiro sistema de arquivo (ext2, reiserfs) para esse "
 "ponto de montagem\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Erro arbindo %s para grava��o: %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"
@@ -1871,341 +2050,411 @@ msgstr ""
 "Ocorreu um erro - nenhum dispositivo v�lido foi encontrado para criar novos "
 "sistema de arquivos. Favor checar seu hardware para a causa desse problema"
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Voc� n�o tem nenhuma parti��o!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr ""
-"Favor escolher seu idioma preferido para a instala��o e utiliza��o do 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 ""
-"Voc� precisa aceitar os termos da licen�a acima para continuar a "
-"instala��o.\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"
-"Favor clicar em \"Aceitar\" se voc� concordar com ela.\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"
-"Favor clicar em \"Recusar\" se voc� n�o concorda com ela. A instala��o ser� "
-"cancelada sem modificar a sua configura��o\n"
-"atual."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Escolha o tipo de layout correspondente ao seu teclado na lista acima"
-
-#: ../../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 ""
-"Se voc� desejar, outros idiomas (al�m do que voc� escolheu\n"
-"no in�cio da instala��o) estar�o dispon�veis ap�s a instala��o, favor "
-"escolh�-los\n"
-"na lista acima. Se voc� quiser todos, voc� precisa apenas selecionas \"Todos"
-"\"."
-
-#: ../../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"
+" * \"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 ""
+"Acima est�o listadas as parti��es Linux detectadas no\n"
+"seu disco r�gido. Voc� pode manter as op��es feitas pelo o ajudante, elas "
+"s�o\n"
+"boas para o uso di�rio. Se voc� quiser alterar essas op��es, voc� deve ao\n"
+"menos definir uma parti��o (\"/\"). N�o escolhe uma parti��o muito pequena "
+"ou voc�\n"
+"n�o ser� capaz de instalar software suficiente. Se voc� quiser guardar seus "
+"dados em\n"
+"uma parti��o separada, voc� precisa escolher uma \"/home\" (apenas poss�vel "
+"se voc�\n"
+"tiver mais de uma parti��o Linux dispon�vel).\n"
 "\n"
+"Nota: cada parti��o � listada da seguinte forma: \"Nome\", \"Capacidade\".\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"
+"\"Nome\" � codificado da seguinte maneira: \"tipo do disco r�gido\", "
+"\"n�mero\n"
+"do disco r�gido\", \"n�mero da parti��o\" (por exemplo, \"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"
+"\"Tipo do disco r�gido\" � \"hd\" se seu disco r�gido for IDE e \"sd\"\n"
+"se ele for um disco r�gido 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 ""
-"Favor escolher \"Instalar\" caso n�o exista nenhuma vers�o anterior doLinux-"
-"Mandrake\n"
-"instalado ou se voc� deseja utilizar v�rios sistemas operacionais.\n"
+"\"N�mero do disco r�gido\" � sempre uma letra depois de \"hd\" ou \"sd\".Com "
+"discos r�gidos IDE:\n"
 "\n"
+"   * \"a\" significa \"disco r�gido mestre na controladora IDE prim�ria\",\n"
 "\n"
-"Favor escolher \"Atualizar\" se voc� deseja atualizar uma vers�o instalada "
-"do Linux-Mandrake.\n"
+"   * \"b\" significa \"disco r�gido escravo na controladora IDE prim�ria\",\n"
 "\n"
+"   * \"c\" significa \"disco r�gido mestre na controladora IDE secund�ria"
+"\",\n"
 "\n"
-"Dependendo do seu conhecimento sobre GNU/Linux, voc� pode escolher um dos "
-"seguintes n�veis para instalar\n"
-"ou atualizar o seu Linux-Mandrake:\n"
+"   * \"d\" significa \"disco r�gido escravo na controladora IDE secund�ria"
+"\",\n"
 "\n"
-"\t* Recomendado: se voc� nunca instalou um sistema GNU/Linux escolha esse. A "
-"instala��o ser� bem\n"
-"\t  f�cil e lhe ser�o perguntadas apenas algumas perguntas.\n"
 "\n"
+"Com discos r�gidos SCSI, um significa \"disco r�gido prim�rio\", um \"b\" "
+"significa \"disco r�gido secund�rio\", 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* Personalizado: se voc� estiver familiarizado com o GNU/Linux, voc� pode "
-"escolher o uso prim�rio (esta��o, \n"
-"\t  servidor, desenvolvimento) do seu sistema. Voc� responder� a mais "
-"perguntas do que na classe de instala��o\n"
-"\t  \"Recomendada\", ent�o voc� precisa saber com o GNU/Linux funciona para "
-"poder escolher esse n�vel.\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* Expert: se voc� tem um bom conhecimento sobre o GNU/Linux, voc� pode "
-"escolher essa classe. Como em \n"
-"\t  na classe \"Personalizado\", voc� poder� escolher o uso prim�rio"
-"(esta��o, servidor, desenvolvimento)\n"
-"\t  Tenha muito cuidado antes de escolher essa classe. Voc� poder� fazer uma "
-"instala��o bastante personalizada.\n"
-"\t  Responda a algumas quest�es que podem ser bem dif�ceis se voc� n�o tiver "
-"conhecimento sobre GNU/Linux.\n"
-"\t  Ent�o, s� escolha essa classe se souber o que est� fazendo."
-
-#: ../../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 ""
-"Selecione:\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"
-"  - Personalizado: Se voc� j� est� familiarizado com o GNU/Linux, voc� "
-"poder� escolher\n"
-"    a utiliza��o prim�ria de sua m�quina. Veja abaixo para detalhes.\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"
-"  - Expert: Se voc� � fluente com o GNU/Linux e quer fazer uma\n"
-"    instala��o altamente personalizada. Como na classe de instala��o "
-"\"Personalizado\",\n"
-"    voc� poder� escolher a utiliza��o do seu sistema.\n"
-"    Mas por favor, N�O ESCOLHA ESSE A N�O SER QUE VOC� SAIBA O QUE VOC� EST� "
-"FAZENDO!"
+"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 ""
-"Voc� agora deve definir a utiliza��o de sua m�quina. As escolhas s�o:\n"
-"\n"
-"\t* Esta��o de Trabalho: essa � a escolha idel se voc� pretende usar sua "
-"m�quina basicamente para uso di�rio, no\n"
-"\t  escrit�rio ou em 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* Desenvolvimento: se voc� pretense usar sua m�quina primariamente para "
-"desenvolver software, essa � uma boa escolha.\n"
-"\t  Voc� ter� instalado todo os softwares necess�rios para se compilar, "
-"debugar e editar c�digo fonte,\n"
-"\t  ou criar pacotes de software.\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: se voc� pretende usar essa m�quina como servidor, essa � uma "
-"boa escolha. Tanto como servidor de\n"
-"\t  arquivos (NFS ou SMB), de impress�o (estilo Unix ou Microsoft Windows), "
-"um servidor de autentica��o (NIS), um\n"
-"\t  banco de dados e assim por diante. Como tal, n�o espere que acess�rios "
-"(KDE, GNOME, etc) sejam instalados."
+"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 tentar� localizar adaptadores PCI SCSI. Se DrakX encontrar\n"
-"um adaptador SCSI e souber qual driver utilizar, ele ser� instalado\n"
-"automaticamente\n"
+"Voc� agora pode escolher quais servi�os voc� quer que iniciem na hora da "
+"inicializa��o.\n"
 "\n"
 "\n"
-"Se voc� n�o possuir adaptadores SCSI, um adaptador ISA SCSI ou PCI SCSI que\n"
-"DrakX n�o reconhece, voc� ser� perguntado se algum adaptador SCSI existe em "
-"seu\n"
-"sistema. Se n�o existir adaptadores, voc� pode clicar em \"N�o\". Se voc� "
-"clicar em\n"
-"\"Sim\", uma lista de drivers aparecer� para que voc� possa escolher o seu\n"
-"adaptador.\n"
+"Quando voc� colocar o mouse sobre um item, um pequeno bal�o de ajuda\n"
+"aparecer� descrevendo a fun��o do servi�o.\n"
 "\n"
 "\n"
-"Se voc� tem que especificar manualmente o seu adaptador, DrakX perguntar� "
-"se\n"
-"voc� quer especificar op��es para ele. Voc� pode deixar que o DrakX examine "
-"o hardware\n"
-"para descobrir as op��es. Isso normalmente funciona bem.\n"
+"Tenha muito cuidado nesse passo, pois se voc� pretende usar sua m�quina como "
+"um servidor:\n"
+"voc� provavelmente vai querer que servi�os indesejados n�o sejam iniciados.\n"
+"Favor lembrar que v�rios servi�os podem ser perigosos se foram habilitados "
+"em um\n"
+"servidor. Em geral, selecione apenas os servi�os que voc� realmente precisa."
+
+#: ../../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 gerencia o tempo em GMT (Tempo do Meridiano de Greenwich),\n"
+"e o converte de acordo com a zona de hor�rio que voc� selecionou."
+
+#: ../../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"
-"Se n�o, voc� precisar� prover as op��es para o driver. Favor olhar o Guia do "
-"Usu�rio\n"
-"(cap�tulo 3, se��o \"Coletando informa��es sobre seu hardware) para dicas "
-"sobre\n"
-"como descobrir essas informa��es na documenta��o do hardware, no Web site\n"
-"do fabricante (se voc� tiver acesso � Internet) ou no Microsoft Windows\n"
-"(se voc� tiv�-lo no seu 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 ""
 "A esse ponto, voc� precisa escolher onde voc� quer instalar o seu sistema\n"
-"Linux-Mandrake no seu disco r�gido. Se estiver vazio ou se um sistema\n"
+"Mandrake Linux no seu disco r�gido. Se estiver vazio ou se um sistema\n"
 "operacional existente usa todo o espa�o dispon�vel, voc� ter� que\n"
 "particion�-lo. Basicamente, particionar um disco r�gido consiste em\n"
-"divid�-lo logicamente para criar espa�o para o seu novo sistema Linux-"
-"Mandrake.\n"
+"divid�-lo logicamente para criar espa�o para o seu novo sistema Mandrake "
+"Linux.\n"
 "\n"
 "\n"
 "Como os efeitos de um processo de particionamento s�o normalmente\n"
@@ -2232,127 +2481,235 @@ msgstr ""
 "Para fazer isso, use o ajudante dispon�vel acima. Dependendo da\n"
 "configura��o do seu disco r�gido, v�rias solu��es podem estar dispon�veis:\n"
 "\n"
-"\t* Usar parti��o existente: o ajudante detectado uma ous mais parti��es "
-"Linux j� existentes no seu disco r�gido. Se\n"
-"\t  voc� quiser mant�-las, escolha essa op��o. \n"
+"* Usar parti��o existente: o ajudante detectado uma ous mais parti��es Linux "
+"j� existentes no seu disco r�gido. Se\n"
+"  voc� quiser mant�-las, escolha essa op��o. \n"
 "\n"
 "\n"
-"\t* Apagar todo o disco: se voc� quiser deletar todos os dados e todas as "
-"parti��es existentes no disco r�gidos e \t  substitu�-las pelo seu novo "
-"sitema Linux-Mandrake, voc� pode escolher essa op��o. Tenha cuidado com essa "
+"* Apagar todo o disco: se voc� quiser deletar todos os dados e todas as "
+"parti��es existentes no disco r�gidos e   substitu�-las pelo seu novo sitema "
+"Mandrake Linux, voc� pode escolher essa op��o. Tenha cuidado com essa "
 "op��o,\n"
-"\t  voc� n�o pode reverter sua escolha ap�s a confirma��o.\n"
+"  voc� n�o pode reverter sua escolha ap�s a confirma��o.\n"
 "\n"
 "\n"
-"\t* Usar o espa�o livre na parti��o Windows: se o Microsoft Windows estiver "
+"* Usar o espa�o livre na parti��o Windows: se o Microsoft Windows estiver "
 "instalado no seu disco r�gido e tomar\n"
-"\t  todo o espa�o dispon�vel, voc� tem que criar espa�o livre para o Linux. "
+"  todo o espa�o dispon�vel, voc� tem que criar espa�o livre para o Linux. "
 "Para fazer isso, voc� pode deletar a sua\n"
-"\t  parti��o Microsoft Windows e dados (ver \"Apagar todo o disco\" ou "
+"  parti��o Microsoft Windows e dados (ver \"Apagar todo o disco\" ou "
 "solu��es \"Modo Expert\") ou redimensionar\n"
-"\t  a sua parti��o Microsoft WIndows. O redimensionamento pode ser feito sem "
-"a perda de dados. Essa solu��o �\n"
-"\t  recomendada se voc� quiser usar o Linux-Mandrake e o Microsoft Windows "
-"no mesmo computador.\n"
+"  a sua parti��o Microsoft WIndows. O redimensionamento pode ser feito sem a "
+"perda de dados. Essa solu��o �\n"
+"  recomendada se voc� quiser usar o Mandrake Linux e o Microsoft Windows no "
+"mesmo computador.\n"
 "\n"
 "\n"
-"\t  Antes de escolher essa solu��o, favor entender que o tamanho de sua "
+"  Antes de escolher essa solu��o, favor entender que o tamanho de sua "
 "parti��o\n"
-"\t  Microsoft Windows ser� menor do que agora. Isso significa que voc� ir�\n"
+"  Microsoft Windows ser� menor do que agora. Isso significa que voc� ir�\n"
 "ter menos espa�o livre no Microsoft\n"
-"\t  Windows para guardar os seus dados ou instalar novos programas.\n"
+"  Windows para guardar os seus dados ou instalar novos programas.\n"
 "\n"
 "\n"
-"\t* Modo Expert: se voc� quiser particionar manualmente o seu disco r�gido, "
+"* Modo Expert: se voc� quiser particionar manualmente o seu disco r�gido, "
 "escolha essa op��o. Tenha cuidado\n"
-"\t  antes de escolhe-la. Ela � muito poderosa, mas muito perigosa. Voc� pode "
+"  antes de escolhe-la. Ela � muito poderosa, mas muito perigosa. Voc� pode "
 "perder todos os seus dados\n"
-"\t  facilmente. Ent�o n�o escolha essa solu��o a n�o ser que saiba o que faz."
+"  facilmente. Ent�o n�o escolha essa solu��o a n�o ser que saiba o que faz."
 
-#: ../../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 ""
+"Qualquer parti��o que acabou de ser criada deve ser\n"
+"formatada para o uso (formatar significa criar um sistema de arquivos).\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"
+"Agora, voc� pode reformatar algumas parti��es existentes para apagar os "
+"dados\n"
+"contidos nelas. Se voc� deseja fazer isso, favor tamb�m selecionar quais\n"
+"parti��es voc� deseja formatar\n"
+"\n"
+"\n"
+"Favor notar que n�o � necess�rio reformatar todas as parti��es j� "
+"existentes.\n"
+"Voc� deve reformatar as parti��es contendo o sistema operacional (tal como\n"
+"\"/\",\"/usr\" ou \"/var\"), mas voc� n�o tem que reformatar as parti��es "
+"contendo\n"
+"dados que voc� deseja manter (normalmente /home).\n"
+"\n"
+"\n"
+"Favor tenha cuidado ao selecionar as parti��es, ap�s format�-las,\n"
+"todos os dados ser�o apagados e n�o pode ser recuperados.\n"
+"\n"
+"\n"
+"Cliquem em \"OK\" quando estiver pronto para formatar as parti��es.\n"
+"\n"
+"\n"
+"Clique em \"Cancelar\" se voc� desejar escolher outras parti��es para "
+"instalar\n"
+"o seu novo sistema operacional 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"
+"Please be patient."
+msgstr ""
+"Seu novo sistema operacional Mandrake Linux est� sendo instalado\n"
+"Essa opera��o deve demorar algumas minutos (isso depende do tamanho que\n"
+"voc� escolheu para instalar e a velocidade do seu computador).\n"
+"\n"
+"\n"
+"Por favor seja paciente."
+
+#: ../../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"
-"   * 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"
+"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"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\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, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\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 ""
 "Agora voc� precisa escolher qual(is)\n"
-"parti��o(�es) utilizar para instalar o seu novo sistema Linux-Mandrake. Se "
+"parti��o(�es) utilizar para instalar o seu novo sistema Mandrake Linux. Se "
 "asparti��es\n"
 "j� estiverem definidas (atrav�s de uma instala��o anterior do GNU/Linux ou "
 "outra\n"
@@ -2425,170 +2782,42 @@ msgstr ""
 "pouco maior, digamos 50MB, voc� pode usar o espa�o \n"
 "para guardar um kernel extra e uma imagem ramdisk para emerg�ncias."
 
-#: ../../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"
+"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"
-"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"
+"\"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 ""
-"Acima est�o listadas as parti��es Linux detectadas no\n"
-"seu disco r�gido. Voc� pode manter as op��es feitas pelo o ajudante, elas "
-"s�o\n"
-"boas para o uso di�rio. Se voc� quiser alterar essas op��es, voc� deve ao\n"
-"menos definir uma parti��o (\"/\"). N�o escolhe uma parti��o muito pequena "
-"ou voc�\n"
-"n�o ser� capaz de instalar software suficiente. Se voc� quiser guardar seus "
-"dados em\n"
-"uma parti��o separada, voc� precisa escolher uma \"/home\" (apenas poss�vel "
-"se voc�\n"
-"tiver mais de uma parti��o Linux dispon�vel).\n"
-"\n"
-"Nota: cada parti��o � listada da seguinte forma: \"Nome\", \"Capacidade\".\n"
-"\n"
-"\n"
-"\"Nome\" � codificado da seguinte maneira: \"tipo do disco r�gido\", "
-"\"n�mero\n"
-"do disco r�gido\", \"n�mero da parti��o\" (por exemplo, \"hda1\").\n"
-"\n"
-"\n"
-"\"Tipo do disco r�gido\" � \"hd\" se seu disco r�gido for IDE e \"sd\"\n"
-"se ele for um disco r�gido SCSI.\n"
-"\n"
-"\n"
-"\"N�mero do disco r�gido\" � sempre uma letra depois de \"hd\" ou \"sd\".Com "
-"discos r�gidos IDE:\n"
-"\n"
-"   * \"a\" significa \"disco r�gido mestre na controladora IDE prim�ria\",\n"
-"\n"
-"   * \"b\" significa \"disco r�gido escravo na controladora IDE prim�ria\",\n"
-"\n"
-"   * \"c\" significa \"disco r�gido mestre na controladora IDE secund�ria"
-"\",\n"
-"\n"
-"   * \"d\" significa \"disco r�gido escravo na controladora IDE secund�ria"
-"\",\n"
-"\n"
-"\n"
-"Com discos r�gidos SCSI, um significa \"disco r�gido prim�rio\", um \"b\" "
-"significa \"disco r�gido secund�rio\", 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 ""
-"Escolha o disco r�gido que voc� quer apagar para instalar\n"
-"sua parti��o Linux-Mandrake. Tenha cuidado, pois todos os dados existentes "
-"ser�o\n"
-"perdidos e n�o poder�o ser recuperados."
-
-#: ../../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 ""
-"Clique em \"OK\" se voc� quiser apagar todos os\n"
-"dados e parti��o existentes nesse disco r�gido. Tenha cuidado, pois ap�s "
-"clicar\n"
-"em \"OK\", voc� n�o ser� capaz de recuperar os dados/parti��es existentes "
-"nesse\n"
-"disco r�gido, incluindo quaisquer dados do Windows.\n"
-"\n"
-"\n"
-"Clique em \"Cancelar\" para cancelar essa opera��o sem perder qualquer dado\n"
-"e parti��o presente nesse disco r�gido."
-
-#: ../../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 ""
 "Mais de uma parti��o Microsoft Windows foi detectada\n"
 "em seu disco r�gido. Favor escolher a que voc� quer redimensionar para\n"
-"instalar o seu novo sistema operacional Linux-Mandrake.\n"
+"instalar o seu novo sistema operacional Mandrake Linux.\n"
 "\n"
 "\n"
 "Nota: cada parti��o � listada da seguinte forma: \"Nome Linux\", \"Nome\n"
@@ -2624,803 +2853,230 @@ msgstr ""
 "\"Nome Windows\" � a letra do seu disco r�gido no Windows (o primeirodisco\n"
 "ou parti��o � chamado \"C:\")."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr "Por favor seja paciente. Essa opera��o pode demorar v�rios minutos."
 
-#: ../../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 ""
-"Qualquer parti��o que acabou de ser criada deve ser\n"
-"formatada para o uso (formatar significa criar um sistema de arquivos).\n"
+"Favor escolher \"Instalar\" caso n�o exista nenhuma vers�o anterior "
+"doMandrake Linux\n"
+"instalado ou se voc� deseja utilizar v�rios sistemas operacionais.\n"
 "\n"
 "\n"
-"Agora, voc� pode reformatar algumas parti��es existentes para apagar os "
-"dados\n"
-"contidos nelas. Se voc� deseja fazer isso, favor tamb�m selecionar quais\n"
-"parti��es voc� deseja formatar\n"
+"Favor escolher \"Atualizar\" se voc� deseja atualizar uma vers�o instalada "
+"do Mandrake Linux.\n"
 "\n"
 "\n"
-"Favor notar que n�o � necess�rio reformatar todas as parti��es j� "
-"existentes.\n"
-"Voc� deve reformatar as parti��es contendo o sistema operacional (tal como\n"
-"\"/\",\"/usr\" ou \"/var\"), mas voc� n�o tem que reformatar as parti��es "
-"contendo\n"
-"dados que voc� deseja manter (normalmente /home).\n"
-"\n"
+"Dependendo do seu conhecimento sobre GNU/Linux, voc� pode escolher um dos "
+"seguintes n�veis para instalar\n"
+"ou atualizar o seu Mandrake Linux:\n"
 "\n"
-"Favor tenha cuidado ao selecionar as parti��es, ap�s format�-las,\n"
-"todos os dados ser�o apagados e n�o pode ser recuperados.\n"
+"* Recomendado: se voc� nunca instalou um sistema GNU/Linux escolha esse. A "
+"instala��o ser� bem\n"
+"  f�cil e lhe ser�o perguntadas apenas algumas perguntas.\n"
 "\n"
 "\n"
-"Cliquem em \"OK\" quando estiver pronto para formatar as parti��es.\n"
+"* Personalizado: se voc� estiver familiarizado com o GNU/Linux, voc� pode "
+"escolher o uso prim�rio (esta��o, \n"
+"  servidor, desenvolvimento) do seu sistema. Voc� responder� a mais "
+"perguntas do que na classe de instala��o\n"
+"  \"Recomendada\", ent�o voc� precisa saber com o GNU/Linux funciona para "
+"poder escolher esse n�vel.\n"
 "\n"
 "\n"
-"Clique em \"Cancelar\" se voc� desejar escolher outras parti��es para "
-"instalar\n"
-"o seu novo sistema operacional Linux-Mandrake."
+"* Expert: se voc� tem um bom conhecimento sobre o GNU/Linux, voc� pode "
+"escolher essa classe. Como em \n"
+"  na classe \"Personalizado\", voc� poder� escolher o uso prim�rio(esta��o, "
+"servidor, desenvolvimento)\n"
+"  Tenha muito cuidado antes de escolher essa classe. Voc� poder� fazer uma "
+"instala��o bastante personalizada.\n"
+"  Responda a algumas quest�es que podem ser bem dif�ceis se voc� n�o tiver "
+"conhecimento sobre GNU/Linux.\n"
+"  Ent�o, s� escolha essa classe se souber o que est� fazendo."
 
-#: ../../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 ""
-"Voc� pode selecionar o grupo de pacotes que voc�\n"
-"desejar instalar ou atualizar.\n"
-"\n"
-"\n"
-"Ent�o, DrakX verificar� se voc� tem espa�o suficientes para instal�-los.Se "
-"n�o,\n"
-"voc� ser� avisado. Se voc� quiser continuar, voc� poder� proceder para a\n"
-"instala��o de todos os grupos selecionados mas alguns grupos de menor\n"
-"interesse n�o ser�o instalados. No fim da lista voc� pode selecionar \n"
-"a op��o \"Sele��o individual de pacotes\"; nesse caso voc� poder� navegar\n"
-"entre mais de 1000 pacotes..."
 
-#: ../../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"
+"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 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 ""
-"Voc� agora pode selecionar individualmente todos os\n"
-"pacotes que voc� deseja instalar.\n"
-"\n"
-"\n"
-"Voc� pode expandir ou colapsar a �rvore clicando na op��o no canto esquerdo "
-"da\n"
-"janelas de pacotes.\n"
-"\n"
-"\n"
-"Se voc� quiser ver os pacotes em ordem alfab�tica, clique no �cone\n"
-"\"Ativar"
 
-#: ../../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 ""
-"Se voc� tiver todos os CDs da lista acima, clique em Ok. Se voc�\n"
-"n�o tiver nenhum desses CDs, clique em Cancelar. Se apenas alguns CDs "
-"estiverem,\n"
-"faltando, desmarque-os e ent�o clique em 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"
-"\n"
-"\n"
-"Please be patient."
-msgstr ""
-"Seu novo sistema operacional Linux-Mandrake est� sendo instalado\n"
-"Essa opera��o deve demorar algumas minutos (isso depende do tamanho que\n"
-"voc� escolheu para instalar e a velocidade do seu computador).\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"
-"Por favor seja paciente."
-
-#: ../../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 ""
-"Voc� agora pode testar seu mouse. Use os bot�es e a roda para\n"
-"verificar se as configura��es est�o boas. Se n�o estiverem, voc� pode "
-"clicar\n"
-"em \"Cancelar\" e escolher outro driver."
 
-#: ../../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 ""
 "Favor selecionar a porta correta. Por exemplo, a porta COM1\n"
 "no MS Windows � chamada ttyS0 no 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 ""
-"Se voc� deseja conectar seu computador � Internet ou\n"
-"� uma rede local, escolha a op��o correta. Favor ativar o seu dispositivo "
-"antes\n"
-"de escolher a op��o correta de deixar o DrakX detect�-lo automaticamente.\n"
-"\n"
-"\n"
-"Se voc� n�o tiver nenhuma conex�o � Internet ou a uma rede local, escolha\n"
-"\"Desabilitar rede\".\n"
-"\n"
-"\n"
-"Se voc� deseja configurar sua rede depois da instala��o ou se voc� tiver "
-"terminado\n"
-"de configurar sua conex�o � rede, escolha \"Pronto\"."
-
-#: ../../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 ""
-"Nenum modem foi detectado. Favor escolher a porta serial em que seu modem "
-"est� conectado.\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"
-"Nota, a primeira porta serial (chamada \"COM1\" no Microsoft Windows)\n"
-"� chamada \"ttyS0\" no 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 ""
-"Voc� pode agora configurar a rede dialup. Se voc�\n"
-"n�o sabe ou n�o tem certeza sobre o que colocar, as informa��es corretas "
-"podem\n"
-"ser obtidas com o seu Provedor de Intenet. Se voc� n�o digitar o DNS \n"
-"(nome do servidor) aqui, essa informa��o ser� obtida com o seu Provedor de "
-"Internet\n"
-"na hora da conex�o."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Se o seu modem for um modem externo, favor lig�-lo agora para deixar "
-"odetect�-lo automaticamente."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Favor ligar o seu modem e escolha o correto."
-
-#: ../../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 ""
-"Se voc� n�o tem certeza se as informa��es acima\n"
-"est�o corretas ou se voc� n�o sabe ou n�o tem certeza sobre o que colocar,\n"
-"as informa��es corretas podem ser obtidas com o seu Provedor de Internet. Se "
-"voc�\n"
-"n�o digitar o DNS (nome do servidor) aqui, essa informa��o ser� obtida com o "
-"seu\n"
-"Provedor de Internet na hora da conex�o."
-
-#: ../../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 ""
-"Agora voc� pode entrar com o nome do host, se necess�rio. Se voc�\n"
-"n�o tem certeza sobre o que colocar, a informa��o correta pode ser obtida\n"
-"com o seu provedor."
-
-#: ../../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."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Voc� pode agora configurar seu dispositivo de rede:\n"
-"\n"
-"   * Endere�o IP: se voc� n�o saber qual �, pergunte ao administrador da "
-"rede.\n"
-"     Voc� n�o pode entrar com um n�mero IP se voc� selecionar a op��o \"IP "
-"Autom�tico\" abaixo.\n"
-"\n"
-"   * Netmask: \"255.255.255.0\" � normalmente uma boa escolha. Se voc� n�o "
-"tem certeza sobre o que colocar,\n"
-"     pergunte ao administrador da rede.\n"
-"\n"
-"   * IP Autom�tico: se sua rede usa o protocolo BOOTP ou DHCP, selecione "
-"essa op��o. Se selecionada, nenhum valor � necess�rio em \n"
-"    \"Endere�o IP\". Se voc� n�o tem certeza se deve selecionar essa op��o, "
-"pergunte ao administrador de rede."
-
-#: ../../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 ""
-"Voc� pode agora colocar o nome do seu host, se necess�rio.\n"
-" Se voc� n�o sabe sobre o que colocar, pergunte ao administrador da rede."
-
-#: ../../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 ""
-"Voc� pode agora colocar o nome do host, se necess�rio.\n"
-"Se voc� n�o sabe ou n�o ter certeza, deixe em branco."
-
-#: ../../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 ""
-"Agora voc� pode entrar com as op��es dialup. Se voc� n�o tem certeza sobre\n"
-"o que colocar, a informa��o correta pode ser obtida com o seu provedor."
-
-#: ../../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 voc� ir� usar proxies, favor configur�-los agora. Se voc� n�o sabe se\n"
-"ir� usar proxies, pergunte ao seu administrador de rede ou ao seu provedor."
 
-#: ../../help.pm_.c:459
+#: ../../help.pm_.c:600
 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"
+"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"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"Voc� pode instalar o pacote criptogr�fico se sua conex�o com a internet foi\n"
-"configurada corretamente. Primeiro, escolha um espelho de onde voc� deseja "
-"fazer\n"
-"o download dos pacotes e ap�s isso, selecione os pacotes a serem "
-"instalados.\n"
-" \n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
-"Note que voc� deve escolher o mirror (espelho) e pacotes criptogr�fico de\n"
-"acordo com a sua legisla��o."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Voc� agora pode escolher seu fuso hor�rio de acordo com onde voc� vive"
-
-#: ../../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"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"GNU/Linux gerencia o tempo em GMT (Tempo do \n"
-"Meridiano de Greenwich), e o converte de acordo com a zona de hor�rio que\n"
-"voc� selecionou.\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"
-"Se voc� usar o Microsoft Windows nesse computador, escolha \"N�o\"."
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\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"
-"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 ""
-"Voc� agora pode escolher quais servi�os voc� quer que iniciem na hora da "
-"inicializa��o.\n"
-"\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
-"Quando voc� colocar o mouse sobre um item, um pequeno bal�o de ajuda\n"
-"aparecer� descrevendo a fun��o do servi�o.\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"
-"Tenha muito cuidado nesse passo, pois se voc� pretende usar sua m�quina como "
-"um servidor:\n"
-"voc� provavelmente vai querer que servi�os indesejados n�o sejam iniciados.\n"
-"Favor lembrar que v�rios servi�os podem ser perigosos se foram habilitados "
-"em um\n"
-"servidor. Em geral, selecione apenas os servi�os que voc� realmente precisa."
-
-#: ../../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)."
+"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 ""
-"Voc� pode configurar uma impressora local (conectada ao seu computador),\n"
-"ou remota (acess�vel via uma rede Unix, Netware ou 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 ""
-"Se voc� quer estar capaz de imprimir, favor escolher um sistema de "
-"impress�o\n"
-"entre o CUPS e o LPR.\n"
-"\n"
-"\n"
-"CUPS � um novo, poderoso e flex�vel sistema de impress�o para sistema UNIX\n"
-"(CUPS significa \"Common Unix Printing System\"). Esse � o sistema de "
-"impress�o\n"
-"padr�o do Linux-Mandrake.\n"
-"\n"
-"\n"
-"LPR � um velho sistema de impress�o usado em antigas distribui��es Linux-"
-"Mandrake.\n"
-"\n"
-"\n"
-"Se voc� n�o tem nenhuma impressora, clique em \"Nenhuma\"."
-
-#: ../../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 pode lidar com v�rios tipos de impressoras. Cada uma requer uma\n"
-"configura��o diferente.\n"
-"\n"
-"\n"
-"Se sua impressora � fisicamente conectada ao seu computador, selecione\n"
-"impressora \"Local\n"
-"\n"
-"\n"
-"Se voc� deseja acessar uma impressora localizada em uma m�quina Unix "
-"remota,\n"
-"selecione \"Impressora Remota\".\n"
-"\n"
-"\n"
-"Se voc� deseja acessar uma impressora localizada em uma m�quina Microsoft "
-"Windows\n"
-"remota (ou uma m�quina Unix usando protocolo SMB), selecione \"SMB/"
-"Windows95/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 ""
-"Favor ligar a sua impressora antes de deixar o DrakX tentar detect�-la.\n"
-"\n"
-"Voc� tem que colocar algumas informa��es aqui.\n"
-"\n"
-"\n"
-"   * Nome da impressora: o spooler de impress�o usa \"lp\" como o nome "
-"padr�o.Ent�o, voc� tem que ter uma impressora chamada\n"
-"     \"lp\". Se voc� tem apenas uma impressora, voc� pode usar v�rios "
-"nomespara ela. Voc� precisa apenas separ�-los por um\n"
-"     caractere pipe (um \"|\"). Ent�o, se voc� preferir um nome mais "
-"significante, voc� tem que coloc�-lo primeiro,\n"
-"     ex: \"Minha impressora|lp\". A impressora com o nome \"lp\" ser� a "
-"impressora padr�o.\n"
-"\n"
-"\n"
-"   * Descri��o: esse � opcional, mas pode ser �til se v�rias impressoras "
-"est�o conectadas ao seu computador ou se\n"
-"     voc� permite que outros computadores acessem essa impressora.\n"
-"\n"
-"\n"
-"   * Localiza��o: se voc� quiser colocar alguma informa��o sobre a\n"
-"     localiza��o da impressora, coloque aqui (voc� pode escrever o que\n"
-"     quiser, por exemplo \"Segundo andar\").\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 ""
-"Voc� precisa colocar algumas informa��es aqui.\n"
-"\n"
-"\n"
-"   * Nome da fila: o spooler de impress�o usa \"lp\" como o nome padr�o."
-"Ent�o, voc� tem que ter uma impressora chamada\n"
-"     \"lp\". Se voc� tem apenas uma impressora, voc� pode usar v�rios "
-"nomespara ela. Voc� precisa apenas separ�-los por um\n"
-"     caractere pipe (um \"|\"). Ent�o, se voc� preferir um nome mais "
-"significante, voc� tem que coloc�-lo primeiro,\n"
-"     ex: \"Minha impressora|lp\". A impressora com o nome \"lp\" ser� a "
-"impressora padr�o.\n"
-"\n"
-"\n"
-"   * Diret�rio spool: � o diret�rio onde os trabalhos de impress�o s�o "
-"armazenados. Mantenha a\n"
-"     escolha padr�o se voc� n�o sabe o que usar\n"
-"\n"
-"\n"
-"   * Conex�o da impressora: Se sua impressora estiver conectada fisicamente "
-"ao seu computador, escolha \"Impressora\n"
-"     Local\". Se voc� quiser acessar um impressora conectada a uma m�quina "
-"Unix remota, escolha \"Impressora ldp remota\".\n"
-"\n"
-"\n"
-"     Se voc� quiser acessar uma impressora localizada em uma m�quina "
-"Microsoft Windows remota (ou UNIX usando o protocolo\n"
-"     SMB), selecione \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     Se voc� quiser accear uma impressora localizada em uma rede Netware, "
-"selecione \"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 ""
-"Sua impressora n�o foi detectada. Favor digitar o nome do dispositivo a\n"
-"qual est� conectada.\n"
-"\n"
-"\n"
-"Nota, a maioria das impressoras est�o conectadas � primeira porta paralela.\n"
-"Ela � chamada \"/dev/lp0\" no GNU/Linux e \"LPT1\" no MicrosoftWindows."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Voc� agora deve selecionar sua impressora da lista acima."
-
-#: ../../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 ""
-"Favor selecionar as op��es corretas de acordo com a sua impressora.\n"
-"Favor verificar a documenta��o dela se voc� n�o sabe o que escolher aqui.\n"
-"\n"
-"\n"
-"Voc� poder� testar a sua configura��o no pr�ximo passo e voc� ser� capaz de "
-"modific�-la se n�o estiver funcionando do jeito que voc� quer."
-
-#: ../../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"
-"\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 ""
-"Agora voc� deve entrar com a senha root do seu sistema Linux-Mandrake.\n"
-"A senha deve ser digitada duas vezes para verificar se as senhas\n"
-"digitadas s�o id�nticas.\n"
-"\n"
-"\n"
-"Root � o administrador do sistema, e � o �nico usu�rio que pode modificar\n"
-"a\n"
-"configura��o do sistema. Ent�o escolha a senha com cuidado\n"
-"Uso n�o-autorizado da conta root pode ser extremamente perigoso\n"
-"� integridade\n"
-"do sistema e seus dados, e outros sitemas conectados a ele.\n"
-"\n"
-"\n"
-"A senha deve ser uma mistura de caracteres alfa-num�ricos com no m�nimo 8\n"
-"caracteres. Ela nunca deve ser anotada.\n"
-"\n"
-"\n"
-"N�o fa�a a senha muito grande ou muito complicada, voc� tem que ser capaz\n"
-"de lembrar dela sem muita dificuldade."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Para ter um sistema mais segura, voc� deve escolher \"Usar arquivo shadow\"\n"
-"e \"Usar senhas 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 ""
-"Se sua rede usa NIS, selecione \"Usar NIS\". Se voc� n�o sabe, pergunte\n"
-"ao seu administrador de rede."
-
-#: ../../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"
-"\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 ""
-"Agora voc� pode criar uma ou mais contas de usu�rios \"regulares\"\n"
-"que s�o opostas � conta \"privil�giada\" do root. Voc� pode criar uma\n"
-"ou mais contas para cada pessoa que voc� quer permitir usar esse\n"
-"computador. Note que cada conta de usu�rio tem suas pr�prias prefer�ncias\n"
-"(ambiente gr�fico, configura��o de progrmas, etc.) e seu pr�prio\n"
-"\"diret�rio home\" que � o local onde essas prefer�ncias ir�o ser\n"
-"guardadas.\n"
-"\n"
-"\n"
-"Em primeiro lugar, crie uma conta para voc� mesmo! Mesmo que voc� seja o "
-"�nico usu�rio\n"
-"da m�quina, voc� N�O pode se conectar como root no uso di�rio desse "
-"sistema:\n"
-"� um risco muito grande. Deixar o sistema defeituoso pode ser causado por "
-"erro de digita��o\n"
-"\n"
-"\n"
-"Al�m do mais, voc� deve se conectar ao sistema usando a conta de usu�rio\n"
-"que voc� criou aqui, e se logar como root somente para prop�sitos de\n"
-"manuten��o e administra��o."
-
-#: ../../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 ""
-"A cria��o de um disco de inicializa��o � altamente recomendada.\n"
-"Se voc� n�o conseguir inicializar o seu computador, � a �nica maneira\n"
-"de resgatar o seu sistema sem ter que reinstal�-lo."
-
-#: ../../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 ""
-"Voc� precisa indicar onde voc� deseja\n"
-"guardar a informa��o necess�ria para inicializar o GNU/Linux.\n"
-"\n"
-"\n"
-"A n�o ser que voc� saiba exatamente o que est� fazendo, escolha \"Primeiro\n"
-"setor do drive (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 ""
-"A n�o ser que voc� saiba especificamente o contr�rio, a escolha comum �\n"
-"\"/dev/hda\" (disco IDE mestre do canal prim�rio) ou \"/dev/sda\"  (primeiro "
-"disco 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 (o LInux LOader) e Grub s�o gerenciadors de boot: ele s�o capazes de\n"
 "de inicializar tanto no GNU/Linux quanto qualquer outro sistema\n"
@@ -3434,237 +3090,159 @@ msgstr ""
 "ningu�m, na qual voc� pode deletar as entradas correspondentes. Mas nesse\n"
 "caso, voc� precisar� de um disco de inicializa��o para poder utiliz�-los!"
 
-#: ../../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"
-"\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."
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
 msgstr ""
-"As principais op��es do LILO e do grub s�o:\n"
-"  - Dispositivo de boot: Indica o nome do dispositivo (ex.: uma parti��o\n"
-"do disco r�gido) que cont�m o setor de boot. A n�o ser que voc� saiba\n"
-"exatamente o que est� fazendo, escolha \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Tempo de espera antes do boot padr�o: Especifica o tempo em d�cimos\n"
-"de segundo que o gerenciador de inicializa��o deve esperar antes de entrar\n"
-"na imagem padr�o. Isso � �til em sistemas que fazem o boot imediato do\n"
-"disco r�gido depois de ativar o teclado. O gerenciador de inicializa��o n�o\n"
-"esperar� se  \"delay\" for omitido ou com o valor zero.\n"
-"\n"
-"\n"
-"  - Modo do v�deo: Isso especifica o modo de texto VGA que deve ser\n"
-"selecionado durante o boot. Os seguintes valores s�o dispon�veis: \n"
-"\n"
-"    * normal: seleciona o modo de texto normal 80x25.\n"
-"\n"
-"    * <n�mero>: usa o modo de texto correspondente.\n"
-"\n"
-"  - Limpar \"/tmp\" a cada inicializa��o: se voc� quiser apagar todos os "
-"arquivos\n"
-"e diret�rios em \"/tmp\" quando iniciar o sistema, marque essa op��o.\n"
+"Voc� precisa indicar onde voc� deseja\n"
+"guardar a informa��o necess�ria para inicializar o GNU/Linux.\n"
 "\n"
 "\n"
-"  - Especificar RAM se necess�rio: infelizmente, n�o existe um m�todo "
-"padr�o\n"
-"para perguntar o BIOS a RAM existente no seu computador. Como consequ�ncia, "
-"o Linux\n"
-"pode falhar na detec��o correta da RAM. Se esse for o caso, voc� pode\n"
-"especificar a quantidade correta de RAM. Note que uma diferen�a de 2 ou 4\n"
-"MB entre a RAM detectada e a existente no seu sistema � normal."
+"A n�o ser que voc� saiba exatamente o que est� fazendo, escolha \"Primeiro\n"
+"setor do drive (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"
-"\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"
+"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"
-"  - 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"
+"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"
-"  - Default OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+"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 ""
-"Yaboot � o inicializador para hardware NewWorld MacIntosh. Ele � capaz\n"
-"de inicializar tanto o GNU/Linux, MacOS ou MacOSX, se existente no seu\n"
-"computador. Normalmente, esses outros sistemas operacionais s�o detectados\n"
-"corretamente e instalados. Se esse n�o for o seu caso, voc� pode adicionar\n"
-"entradas manualmente nesta tela. Escolha cuidadosamente os par�metros.\n"
-"\n"
-"\n"
-"A principais op��es do Yaboot s�o:\n"
-"\n"
-"\n"
-"  - Mensagem Inicial: uma pequena mensagem de texto que aparece antes do\n"
-"prompt do boot.\n"
-"\n"
-"\n"
-"  - Dispositivo de boot: Indica onde voc� quer colocar a informa��o "
-"necess�ria \n"
-"para entrar no GNU/Linux. Geralmente, voc� ter� que configurar uma parti��o "
-"bootstrap \n"
-"para manter essa informa��o.\n"
-"\n"
-"\n"
-"   - Tempo de boot do Kernel: esse tempo � similar ao tempo de boot do "
-"LILO.  Ap�s \n"
-"selecionar Linux, voc� ter� 0.1 segundo antes do kernel padr�o ser "
-"selecionado.\n"
+"DrakX tentar� localizar adaptadores PCI SCSI. Se DrakX encontrar\n"
+"um adaptador SCSI e souber qual driver utilizar, ele ser� instalado\n"
+"automaticamente\n"
 "\n"
 "\n"
-"   - Permitir CD Boot?: Marcar essa op��o lhe permitir� escolher 'C' para CD "
-"no\n"
-"primeiro prompt do boot.\n"
+"Se voc� n�o possuir adaptadores SCSI, um adaptador ISA SCSI ou PCI SCSI que\n"
+"DrakX n�o reconhece, voc� ser� perguntado se algum adaptador SCSI existe em "
+"seu\n"
+"sistema. Se n�o existir adaptadores, voc� pode clicar em \"N�o\". Se voc� "
+"clicar em\n"
+"\"Sim\", uma lista de drivers aparecer� para que voc� possa escolher o seu\n"
+"adaptador.\n"
 "\n"
 "\n"
-"   - Permitir OF Boot?: Marcar essa op��o lhe permitir� escolher 'N' para "
-"Firmware\n"
-"Aberto no primeiro prompt de boot.\n"
+"Se voc� tem que especificar manualmente o seu adaptador, DrakX perguntar� "
+"se\n"
+"voc� quer especificar op��es para ele. Voc� pode deixar que o DrakX examine "
+"o hardware\n"
+"para descobrir as op��es. Isso normalmente funciona bem.\n"
 "\n"
 "\n"
-"   - SO padr�o: voc� pode selecionar qual SO ser� iniciado por padr�o quando "
-"o tempo \n"
-"do Firmware Aberto expirar."
+"Se n�o, voc� precisar� prover as op��es para o driver. Favor olhar o Guia do "
+"Usu�rio\n"
+"(cap�tulo 3, se��o \"Coletando informa��es sobre seu hardware) para dicas "
+"sobre\n"
+"como descobrir essas informa��es na documenta��o do hardware, no Web site\n"
+"do fabricante (se voc� tiver acesso � Internet) ou no Microsoft Windows\n"
+"(se voc� tiv�-lo no seu sistema)."
 
-#: ../../help.pm_.c:738
+#: ../../help.pm_.c:720
+#, fuzzy
 msgid ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\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"
-"For other OS's - the entry consists only of a label and the root partition.\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"
-"For Linux, there are a few possible options: \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"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\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"
-"\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 "
+"         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"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\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: 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"
-"  - 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"
+" * 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"
-"  - 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."
+" * 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 ""
 "Voc� pode adicionar entradas adicionais no yaboot, tanto para outros "
 "sistemas operacionais,\n"
@@ -3698,10 +3276,10 @@ msgstr ""
 "do mouse pelo teclado, devido a falta do segundo e terceiro bot�o no mouse "
 "Apple.\n"
 "A seguir est�o alguns exemplos:\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"
@@ -3734,205 +3312,157 @@ msgstr ""
 "se voc�\n"
 "pressionar TAB para ver as op��es de boot."
 
-#: ../../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"
-"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"
+"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"
-"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 � um gerenciado de boot para SPAR: � capaz de\n"
-"de inicializar tanto no GNU/Linux quanto qualquer outro sistema\n"
-"operacional instalado. Normalmente, esses sistemas s�o detectados e\n"
-"instalados corretamente. Se esse n�o for o caso, voc� pode adicionar\n"
-"entradas manualmente nessa tela. Cuidado ao escolher os par�metros "
-"corretos.\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"
-"Voc� pode tamb�m n�o dar acesso a esses sistemas operacionais para\n"
-"ningu�m, na qual voc� pode deletar as entradas correspondentes. Mas nesse\n"
-"caso, voc� precisar� de um disco de inicializa��o para poder utiliz�-los!"
-
-#: ../../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"
+" * 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"
-"  - 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."
+" * 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 ""
-"As principais op��es do SILO s�o:\n"
-"  - Instala��o do gerenciador de inicializa��o: Indicar aonde voc� quer\n"
-"colocar a informa��o requerida para entrar no GNU/Linux. A n�o ser que\n"
-"voc� saiba o que faz, escolha \"Primeiro setor do drive (MBR)\".\n"
+"Yaboot � o inicializador para hardware NewWorld MacIntosh. Ele � capaz\n"
+"de inicializar tanto o GNU/Linux, MacOS ou MacOSX, se existente no seu\n"
+"computador. Normalmente, esses outros sistemas operacionais s�o detectados\n"
+"corretamente e instalados. Se esse n�o for o seu caso, voc� pode adicionar\n"
+"entradas manualmente nesta tela. Escolha cuidadosamente os par�metros.\n"
 "\n"
 "\n"
-"  - Tempo de espera antes do boot padr�o: Especifica o tempo em d�cimos\n"
-"de segundo que o gerenciador de inicializa��o deve esperar antes de entrar\n"
-"na primeira imagem. Isso � util em sistema que fazem a inicializa��o\n"
-"imediata do disco r�gido antes de ativar o teclado. O gerenciador de\n"
-"inicializa��o n�o ir� esperar se  \"delay\" estiver omitido ou com o\n"
-"valor zero."
-
-#: ../../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"
+"A principais op��es do Yaboot s�o:\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 ""
-"Agora � hora de configurar o Sistema de Janelas X, que � o centro\n"
-"da Interface Gr�fica do GNU/Linux (Linux GUI). Para isso, voc� deve\n"
-"configurar sua placa de v�deo e monitor. A maioria desses passos\n"
-"s�o autom�ticos, pode ser que o seu trabalho seja o de apenas\n"
-"verificar o que foi feito e aceitar as configura��es :)\n"
+"  - Mensagem Inicial: uma pequena mensagem de texto que aparece antes do\n"
+"prompt do boot.\n"
 "\n"
 "\n"
-"Quando a configura��o acabar, o X ser� reiniciado (a n�o ser que\n"
-"pe�a ao Drakx para n�o faz�-lo) para voc� checar e ver se\n"
-"a configura��o est�o corretas. Se ela n�o servir, voc� pode voltar\n"
-"e mud�-las, quantas vezes for necess�rio."
-
-#: ../../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 algo estiver errado na configura��o do X, use essas op��es para "
-"configurar\n"
-"corretamento o Sistema de Janelas X."
+"  - Dispositivo de boot: Indica onde voc� quer colocar a informa��o "
+"necess�ria \n"
+"para entrar no GNU/Linux. Geralmente, voc� ter� que configurar uma parti��o "
+"bootstrap \n"
+"para manter essa informa��o.\n"
+"\n"
+"\n"
+"   - Tempo de boot do Kernel: esse tempo � similar ao tempo de boot do "
+"LILO.  Ap�s \n"
+"selecionar Linux, voc� ter� 0.1 segundo antes do kernel padr�o ser "
+"selecionado.\n"
+"\n"
+"\n"
+"   - Permitir CD Boot?: Marcar essa op��o lhe permitir� escolher 'C' para CD "
+"no\n"
+"primeiro prompt do boot.\n"
+"\n"
+"\n"
+"   - Permitir OF Boot?: Marcar essa op��o lhe permitir� escolher 'N' para "
+"Firmware\n"
+"Aberto no primeiro prompt de boot.\n"
+"\n"
+"\n"
+"   - SO padr�o: voc� pode selecionar qual SO ser� iniciado por padr�o quando "
+"o tempo \n"
+"do Firmware Aberto expirar."
 
-#: ../../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 ""
-"Se voc� quiser usar o login gr�fico, selecione \"Sim\". Caso contr�rio,\n"
-"escolha \"N�o\"."
 
-#: ../../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 ""
-"Voc� pode escolher o n�vel de seguran�a do seu sistema. Favor olhar o manual "
-"para mais\n"
-"  informa��es. Basicamente, se voc� n�o sabe qual escolher, mantenha a op��o "
-"padr�o.\n"
+"Escolha o disco r�gido que voc� quer apagar para instalar\n"
+"sua parti��o Mandrake Linux. Tenha cuidado, pois todos os dados existentes "
+"ser�o\n"
+"perdidos e n�o poder�o ser recuperados."
 
-#: ../../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 ""
-"Seu sistema ser� reinicializado.\n"
+"Clique em \"OK\" se voc� quiser apagar todos os\n"
+"dados e parti��o existentes nesse disco r�gido. Tenha cuidado, pois ap�s "
+"clicar\n"
+"em \"OK\", voc� n�o ser� capaz de recuperar os dados/parti��es existentes "
+"nesse\n"
+"disco r�gido, incluindo quaisquer dados do Windows.\n"
 "\n"
-"Ap�s reiniciar, seu novo sistema Linux Mandrake se inicializar� automatica-\n"
-"mente. Se voc� quiser entrar em outro sistema operacional existente,\n"
-"favor ler as instru��es adicionais."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Escolha seu idioma"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Selecione a classe da instala��o"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Detec��o de discos rigidos"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Configurar mouse"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Escolha seu teclado"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Seguran�a"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Setup dos sistemas de arquivos"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formatar parti��es"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Escolha pacotes a serem instalados"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Instalar sistema"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Especificar senha do root"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Adicionar um usu�rio"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Configurar rede"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Sum�rio"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Configurar servi�os"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Criar um disco de inicializa��o"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Instalar gerenciador de inicializa��o"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Configurar X"
+"\n"
+"Clique em \"Cancelar\" para cancelar essa opera��o sem perder qualquer dado\n"
+"e parti��o presente nesse disco r�gido."
 
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Sair da instala��o"
+#: ../../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"
@@ -3957,20 +3487,20 @@ msgstr ""
 "\n"
 "Voc� realmente quer instalar esses servidores?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "N�o pode usar broadcast sem dom�nio NIS"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Insira um disquete FAT formatado no drive %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "Esse disquete n�o est� formatado como FAT"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3978,30 +3508,20 @@ msgstr ""
 "Para usar a sele��o salva de pacotes, entre na instala��o com ``linux "
 "defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Erro lendo arquivo $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Erro lendo arquivo %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 "Favor testar o mouse"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Para ativar o mouse,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "MOVA SUA RODA!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -4011,7 +3531,7 @@ msgstr ""
 "Algum hardware no seu computador precisa de drivers ``propriet�rio'' \n"
 "para funcionar. Voc� pode encontrar informa��es sobre eles em: %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"
@@ -4021,11 +3541,11 @@ msgstr ""
 "Para isso, crie um parti��o (ou click em uma existen).\n"
 "Ent�o escolha a��o ``Ponto de montagem'' e coloque como `/'"
 
-#: ../../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 "Voc� tem que ter uma parti��o 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"
@@ -4035,55 +3555,60 @@ msgstr ""
 "\n"
 "Continuar mesmo assim?"
 
-#: ../../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 "Voc� tem que ter uma parti��o swap"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Usar espa�o livre"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Sem espa�o livre suficiente para alocar as novas parti��es"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Use parti��o existindo"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "N�o existe nenhuma tabela de parti��o para usar"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Usar a parti��o Windows para loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Qual parti��o voc� quer usar para o Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Escolha os tamanhos"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Tamanho da parti��o root em MB:"
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Tamanho da parti��o swap em MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Usar o espa�o livre da parti��o Windows"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Qual parti��o voc� quer redimensionar?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Computando limites do sistema de arquivo do Windows"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4092,13 +3617,13 @@ msgstr ""
 "O redimensionar FAT � incapaz de manipular sua parti��o, \n"
 "o seguinte erro ocorreu: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Sua parti��o Windows est� muito fragmentada, favor rodar primeiro o "
 "``defrag''"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4116,21 +3641,21 @@ msgstr ""
 "ent�o reiniciar a instala��o. Voc� tamb�m deveria fazer backup de seus\n"
 "dados. Quando tiver certeza, pressione Ok."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Quanto de espa�o voc� quer deixar para o windows em"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "parti��o %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Falha no redimensionamento 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)"
@@ -4138,34 +3663,34 @@ msgstr ""
 "N�o existem parti��es FAT para redimensionar ou para usar como loopback (ou "
 "n�o existe espa�o suficiente)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Apague disco inteiro"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Remover 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 ""
 "Voc� tem mais de um disco r�gido, em qual deles voc� quer instalar o 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 ""
 "Todas as parti��es que existem e todos os dados ser�o perdidos em disco %s"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Particionamento de disco personalizada"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Usar fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4174,28 +3699,28 @@ msgstr ""
 "Voc� pode agorar particionar %s.\n"
 "Quando terminar, n�o esque�a de salvar usando `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Voc� n�o tem espa�o livre na sua parti��o Windows"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "Eu n�o achei espa�o para instala��o"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "O particionador DrakX encontrou as solu��es seguintes:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "O particionamento falhou: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Trazendo (acessando) a rede"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Fechando (desconectando) a rede"
 
@@ -4207,12 +3732,12 @@ msgstr ""
 "Um erro ocorreu, mas eu n�o sei como lidar com ele.\n"
 "Continue a seu pr�prio risco."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Ponto de montagem %s duplicado"
 
-#: ../../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"
@@ -4224,16 +3749,16 @@ msgstr ""
 "Cheque o cdrom em um computador instalado usando \"rpm -qpl Mandarke/RPMS/*."
 "rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Bem-vindo � %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Nenhum drive de disquete dispon�vel"
 
-#: ../../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"
@@ -4247,32 +3772,32 @@ msgstr "Escolha o tamanho que voc� deseja instalar"
 msgid "Total size: "
 msgstr "Tamanho 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 "Vers�o: %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 "Tamanho: %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 "Escolha os pacotes que voc� quer instalar"
 
-#: ../../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 "Informa��o"
 
-#: ../../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 "Instalar"
 
-#: ../../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 "Instalando"
 
@@ -4280,7 +3805,7 @@ msgstr "Instalando"
 msgid "Please wait, "
 msgstr "Por favor aguarde, "
 
-#: ../../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 restante "
 
@@ -4289,21 +3814,21 @@ msgid "Total time "
 msgstr "Tempo total "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Preparando instala��o"
 
-#: ../../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 "Instalando pacote %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 "Continuar mesmo assim?"
 
-#: ../../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 "Houve um erro ordenando os pacotes:"
 
@@ -4311,30 +3836,34 @@ msgstr "Houve um erro ordenando os pacotes:"
 msgid "Use existing configuration for X11?"
 msgstr "Usar o configura��o existente para o 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 ""
 "Seu sistema est� com poucos recursos. Voc� pode ter algum problema na\n"
-"instala��o do Linux-Mandrake. Se isso ocorrer, voc� pode tentar instalar "
+"instala��o do Mandrake Linux. Se isso ocorrer, voc� pode tentar instalar "
 "usando o\n"
 "modo texto. Para isso, aperte `F1' na tela de inicializa��o e escreva `text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Classe de Instala��o"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Por favor escolhe uma das seguintes classes de instala��o:"
 
-#: ../../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 ""
 "O tamanho total dos grupos que voc� selecionou � de aproximadamente %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"
@@ -4349,7 +3878,7 @@ msgstr ""
 "Uma baixa percentagem ir� instalar apenas os pacotes mais importantes;\n"
 "uma percentagem de 100%% ir� instalar todos os pacotes selecionados."
 
-#: ../../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"
@@ -4366,85 +3895,69 @@ msgstr ""
 "Uma baixa percentagem ir� instalar apenas os pacotes mais importantes;\n"
 "uma percentagem de %d%% ir� instalar o m�ximo de pacotes poss�vel."
 
-#: ../../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 "Voc� ser� capaz de escolhe-los mais precisamente no pr�ximo passo"
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Percentagem de pacotes a serem instalados"
 
-#: ../../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 "Sele��o de Grupo de Pacotes"
 
-#: ../../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 "Sele��o individual de pacotes"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "Mostra automaticamente os pacotes selecionados"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Expandir �rvore"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Colapsar �rvore"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Mudar entre organiza��o plana ou em grupo"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Tamanho total: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Pacote defeituoso"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nome: %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 "Tamanho 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 ""
 "Voc� n�o pode selecionar esse pacote pois n�o existe espa�o livre para "
 "instal�-lo"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Os seguintes pacotes ser�o instalados"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Os seguintes pacotes ser�o removidos"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Voc� n�o pode selecionar/deselecionar esse pacote"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Esse � um pacote obrigat�rio, n�o pode ser deselecionado"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "Voc� n�o pode deselecionar esse pacote. Ele j� est� instalado"
 
-#: ../../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?"
@@ -4452,24 +3965,43 @@ msgstr ""
 "Esse pacote tem que ser atualizado\n"
 "Tem certeza que voc� quer deselecion�-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 "Voc� n�o pode deselecionar essa pacote. Ele tem que ser atualizado"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Mostra automaticamente os pacotes selecionados"
+
+#: ../../install_steps_gtk.pm_.c:460
+#, fuzzy
+msgid "Load/Save on floppy"
+msgstr "Salvar em disquete"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "Salvar sele��o de pacotes"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "Sair da instala��o"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Estimando"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Por favor aguarde, preparando instala��o"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d pacotes"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4529,15 +4061,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 "Aceitar"
 
-#: ../../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 "Recusar"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4553,7 +4085,7 @@ msgstr ""
 "Se voc� n�o o tiver, aperte em Cancelar para evitar a instala��o desse Cd-"
 "Rom."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Houve um erro instalando os pacotes:"
 
@@ -4561,35 +4093,21 @@ msgstr "Houve um erro instalando os pacotes:"
 msgid "An error occurred"
 msgstr "Ocorreu um erro"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Favor escolher o idioma a ser utilizado."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr ""
-"Voc� pode escolher outros idiomas que estar�o dispon�veis ap�s a instala��o"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Tudo"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Contrato de licen�a"
 
-#: ../../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"
@@ -4643,7 +4161,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"
@@ -4680,7 +4198,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"
@@ -4701,13 +4219,13 @@ msgid ""
 msgstr ""
 "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"
@@ -4761,7 +4279,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"
@@ -4798,7 +4316,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"
@@ -4817,103 +4335,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 "Teclado"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Favor escolher o layout do seu teclado."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "Aqui est� a lista completa de teclados dispon�veis"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Classe de Instala��o"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Qual classe de instala��o voc� quer?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Instalar/Atualizar"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Isso � uma instala��o ou atualiza��o?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Recomendado"
 
-#: ../../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 "Atualizar"
 
-#: ../../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 "Favor escolher o tipo do seu mouse."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Porta do Mouse"
 
-#: ../../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 "Favor escolher em qual porta serial seu mouse est� conectado."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "Emula��o dos bot�es"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "Emula��o dos 2 bot�es"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "Emula��o dos 3 bot�es"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Configurando cart�es 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 "Configurando 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 "sem parti��es dispon�veis"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Escanenado parti��es para encontrar pontos de montagem"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Escolha os ponto de montagem"
 
-#: ../../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"
@@ -4928,7 +4442,7 @@ msgstr ""
 "ser�o perdidos!). A outra solu��o � n�o deixar o DrakX modificar a tabela\n"
 "de partic�o. (o erro � %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!"
@@ -4936,80 +4450,121 @@ msgstr ""
 "O DiskDrake falhou na leitura da tabela de parti��o.\n"
 "Continue a seu pr�prio risco!"
 
-#: ../../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 "Escolha as parti��es que voc� quer formatar"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Parti��o Root"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Qual a parti��o root (/) do seu 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 ""
 "Voc� precisa reiniciar para que as modifica��es na tabela de parti��o tenham "
 "efeito"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Escolha as parti��es que voc� quer formatar"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Checar blocos defeituosos?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Formatando parti��es"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Criando e formatando arquivo %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Sem swap suficiente para completar a instala��o, favor adicionar mais"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Procurando por pacotes dispon�veis"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Procurando pacotes � atualizar"
 
-#: ../../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 ""
 "Seu sistema n�o tem espa�o suficiente para instal��o ou atualiza��o (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Completa (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "M�nima (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Recomendada (%d MB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Personalizada"
 
-#: ../../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 "Restaurar do disquete"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Loading from floppy"
+msgstr "Restaurar do disquete"
+
+#: ../../install_steps_interactive.pm_.c:527
+#, fuzzy
+msgid "Package selection"
+msgstr "Sele��o de Grupo de Pacotes"
+
+#: ../../install_steps_interactive.pm_.c:532
+#, fuzzy
+msgid "Insert a floppy containing package selection"
+msgstr "Insira um disquete no drive %s"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Salvar em disquete"
+
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Selected size is larger than available space"
 msgstr "O tamanho escolhido � maior que o espa�o dispon�vel"
 
-#: ../../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"
@@ -5019,12 +4574,12 @@ msgstr ""
 "Se voc� n�o tiver nenhum desses CDs, clique em Cancelar.\n"
 "Se apenas alguns CDs estiverem faltando, desmarque-os, ent�o clique em Ok."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom rotualdo \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5033,11 +4588,21 @@ msgstr ""
 "Instalando pacote %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Configura��o p�s-instala��o"
 
-#: ../../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 "Insira um disquete no drive %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, fuzzy, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Insira um disquete vazio no drive %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -5111,94 +4676,141 @@ 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 "Escolha um mirror (espelho) de onde pegar os pacotes"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 "Contactando o mirror (espelho) para pegar a lista de pacotes dispon�veis"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Escolha os pacotes que voc� quer instalar"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Qual � o seu fuso hor�rio?"
 
-#: ../../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 "O seu rel�gio do hardware est� configurado como 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 "Sevidor CUPS remoto"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Nenhuma impressora"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Sum�rio"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Mouse"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Fuso hor�rio"
 
-#: ../../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 "Placa ISDN"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Placa de som"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "Placa de TV"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Qual sistema de impress�o voc� quer usar?"
+#: ../../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 "Usar NIS"
+
+#: ../../install_steps_interactive.pm_.c:919
+#: ../../install_steps_interactive.pm_.c:941
+#, fuzzy
+msgid "Local files"
+msgstr "Impressora local"
 
-#: ../../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 "Especificar senha do root"
+
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Nenhuma senha"
 
-#: ../../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 "Essa senha � muito simples (deve ter ao menos %d caracteres)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Usar NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autentica��o?"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "p�ginas amarela"
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "Autentica��o?"
+
+#: ../../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 "servidor"
+
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "Autentica��o NIS"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "Dom�nio 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 "
@@ -5230,19 +4842,19 @@ msgstr ""
 "disquete\n"
 "no drive e aperte em \"OK\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Primeiro drive de disquete"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Segundo drive de disquete"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Pular"
 
-#: ../../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 "
@@ -5266,34 +4878,42 @@ msgstr ""
 "sistema\n"
 "com danos severos. Voc� quer criar um disco de inicializa��o?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Desculpe, nenhum drive de disquete dispon�vel"
 
-#: ../../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 ""
 "Escolha o drive de disquete que voc� quer usar para criar o disco de "
 "inicializa��o"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Insira um disquete no drive %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Criando disco de inicializa��o"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Preparando gerenciador de inicializa��o"
 
-#: ../../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 "Voc� quer usar o 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?"
@@ -5301,18 +4921,24 @@ msgstr ""
 "Erro instalando o aboot, \n"
 "tentar for�ar a instala��o, mesmo que isso destrua a primeira parti��o?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Instalar gerenciador de inicializa��o"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 "A instala��o do gerenciador de inicializa��o falhou. Ocorreram os seguintes "
 "erros:"
 
-#: ../../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 ""
@@ -5323,39 +4949,34 @@ msgstr ""
 " Ent�o escreva: shut-down\n"
 "No seu pr�ximo boot, voc� deve ver o prompt do gerenciador de boot."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Baixo"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "M�dio"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Alto"
 
-#: ../../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 "Escolha n�vel de seguran�a"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"Voc� quer criar um disquete de instala��o automati��o para replica��o do "
-"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 "Insira um disquete vazio no drive %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 "Criando disquete de auto instala��o"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5365,33 +4986,33 @@ msgstr ""
 "\n"
 "Voc� realmente quer sair agora?"
 
-#: ../../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 ""
 "Parab�ns, a instala��o foi completada.\n"
 "Remova a m�dia de inicializa��o e aperte enter para reiniciar.\n"
 "\n"
-"Para informa��es sobre corre��es dispon�veis para essa vers�o do Linux-"
-"Mandrake,\n"
-"consulte a Errata dispon�vel em http://www.linux-mandrake.com/.\n"
+"Para informa��es sobre corre��es dispon�veis para essa vers�o do Mandrake "
+"Linux,\n"
+"consulte a Errata dispon�vel em http://www.mandrakelinux.com/.\n"
 "\n"
 "Informa��es sobre a configura��o do sistema est�o dispon�veis no\n"
-"cap�tulo p�s-instala��o do Guia Oficial de Usu�rio Linux-Mandrake."
+"cap�tulo p�s-instala��o do Guia Oficial de Usu�rio Mandrake Linux."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Criar disquete de auto instala��o"
 
-#: ../../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"
@@ -5405,42 +5026,59 @@ msgstr ""
 "\n"
 "Voc� pode preferir repetir a instala��o.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Autom�tico"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Repetir"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Salvar sele��o de pacotes"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Instala��o do Linux-Mandrake %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Instala��o do 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> move entre op��es  | <Espa�o> seleciona | <F12> pr�xima "
 "tela "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "kdesu ausente"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Escolher a��o"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Avan�ado"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Por favor aguarde"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Expandir �rvore"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Colapsar �rvore"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Mudar entre organiza��o plana ou em grupo"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5466,267 +5104,291 @@ msgstr "Sua escolha? (padr�o %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Sua escolha? (padr�o %s digite `none' para nenhum) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "Tcheco (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 "Alem�o"
 
-#: ../../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 "Espanhol"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Filand�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 "Noruegu�s"
 
-#: ../../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 "Russo"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Sueco"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Ingl�s (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 "Americano (US)"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "Iraniano"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Arm�nio (velho)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Arm�nio (m�quina de escrever)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Arm�nio (fon�tico)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latino)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaidjani (cir�lico)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "B�lgaro"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasileiro (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "Su��o (layout Alem�o)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "Su��o (layout Franc�s)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "Tcheco (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "Tcheco (Programadores)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Alem�o (sem teclas mortas)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Dinamarqu�s"
 
-#: ../../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 (Noruegu�s)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estoniano"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgiano (layout \"Russo\")"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgiano (layout \"Latin\")"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Grego"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "H�ngaro"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Israelense"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Israelense (Fon�tico)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iraniano"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Island�s"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japon�s 106 teclas"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Koreano"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latino Americano"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Maced�nio"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Holand�s"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litu�nio AZERTY (velho)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litu�nio AZERTY (novo)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litu�nio \"n�mero de colunas\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litu�nio \"fon�tico\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Lugar"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Maced�nio"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Holand�s"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Polon�s (layout QWERTY)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Polon�s (layout 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 "Canadense (Quebec)"
 
-#: ../../keyboard.pm_.c:193
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "Russo (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Sueco"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "Russo (Yawerty)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "Russo (Yawerty)"
+
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Eslov�nio"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Eslov�quio (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Eslov�quio (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Eslov�qui (Programadores)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbaidjani (cir�lico)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Teclado Tailand�s"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "Teclado Tailand�s"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turco (modelo \"F\" tradicional)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turco (modelo moderno \"Q\")"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "Americano (Internacional)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"n�mero de colunas\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Iugosl�vio (latin/cir�lico)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Monts circulares %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Remover os volumes l�gicos primeiro\n"
 
@@ -5838,170 +5500,221 @@ msgstr "nenhum"
 msgid "No mouse"
 msgstr "Nenhum Mouse"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Favor testar o mouse"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Para ativar o mouse,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "MOVA SUA RODA!"
+
+#: ../../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 "Terminar"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Pr�ximo ->"
 
-#: ../../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 "Isto est� correto?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Configura��o da Internet"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Conectar � Internet"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Voc� quer tentar se conectar � Internet agora?"
+#: ../../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 ""
+"A maneira mais comum de se conectar com adsl � pppoe.\n"
+"Mas algumas conex�es usam pptp, umas poucas usam dhcp.\n"
+"Se voc� n�o sabe, escolha 'usar pppoe'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Testando sua conex�o..."
+#: ../../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 "O sistema est� conectado � Internet."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "usar dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Por raz�o de seguran�a, voc� ser� desconectado agora."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "usar pppoe"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "usar 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 ""
-"O sistema n�o est� conectado � internet.\n"
-"Tente reconfigurar sua conex�o."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Configura��o da Rede"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "Configura��o ISDN"
+"Qual cliente dhcp voc� quer usar?\n"
+"O padr�o � 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 ""
-"Selecione o seu provedor.\n"
-" Se n�o estiver na lista, escolha N�o Listado"
+"Nenhum adaptador de rede ethernet foi detectado em seu sistema.\n"
+"Eu n�o posso configurar esse tipo de conex�o."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Configura��o da Conex�o"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Escolha a interface de rede"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Favor preencher ou marcar os campos abaixo"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Favor escolher qual adaptador de rede voc� quer usar para se conectar � "
+"Internet"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ da Placa"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "nenhuma placa de rede encontrada"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Mem�ria da Placa (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Configurando rede"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "IO da Placa"
+#: ../../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 ""
+"Favor entrar com o nome do seu host (se voc� souber).\n"
+"Alguns servidores DHCP requerem o nome do host para funcionar.\n"
+"Seu nome do host deve ser um nome de host totalmente qualificado,\n"
+"como por exemplo ``mybox.mylab.myco.com''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "IO_O da Placa"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Host name (nome do host)"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "IO_1 da Placa"
+#: ../../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 "Auxiliar de Configura��o da Rede"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "O n�mero do seu telefone"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Modem ISDN externo"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Nome do provedor (ex: provedor.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Placa ISDN interna"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "N�mero do telefone do provedor"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "De que tipo � sua conex�o ISDN?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "DNS 1 do provedor"
+#: ../../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 do provedor"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "Configura��o de Firewall detectado!"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Modo de discagem"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "Configura��o de Firewall detectado!"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Nome da conta (nome do usu�rio)"
+#: ../../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 "Configura��o ISDN"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Senha da conta"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Selecione o seu provedor.\n"
+" Se n�o estiver na lista, escolha N�o Listado"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Protocolo da inicializa��o"
 
-#: ../../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 "Resto do mundo"
 
-#: ../../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 ""
 "Resto do mundo \n"
 " sem Canal-D (linhas arrendadas)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Qual protocolo voc� quer usar?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Qual tipo de placa voc� tem?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Eu n�o sei"
 
-#: ../../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"
@@ -6013,19 +5726,19 @@ msgstr ""
 "\n"
 "Se voc� tiver uma placa PCMCIA, voc� tem que saber o irq e io de sua placa.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Abortar"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Qual � a sua placa 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."
@@ -6033,110 +5746,60 @@ msgstr ""
 "Eu detectei um placa ISDN PCI, mas n�o sei qual � o tipo. Favor selecionar "
 "uma placa PCI na pr�xima tela."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 "Nenhuma placa ISDN PCI encontrada. Favor selecionar uma na pr�xima tela"
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Nenhum adaptador de rede ethernet foi detectado em seu sistema.\n"
-"Eu n�o posso configurar esse tipo de conex�o."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Escolha a interface de rede"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Favor escolher qual adaptador de rede voc� quer usar para se conectar � "
-"Internet"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Interface de rede"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Voc� concorda?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Eu irei reiniciar o dispositivo de rede:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "Configura��o ADSL"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Voc� quer iniciar sua conex�o ao iniciar?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Favor escolher em qual porta serial seu modem est� conectado."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Op��es dialup"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Nome da conex�o"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "N�mero do telefone"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "ID de Login"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autentica��o?"
+#: ../../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 "Baseado em script"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Baseado em terminal"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Nome do dom�nio"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Primeiro 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 "Segundo Servidor DNS (opcional)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"Eu reiniciarei o dispositivo de rede $netc->{NET_DEVICE}. Voc� concorda?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6144,7 +5807,7 @@ msgstr ""
 "\n"
 "Voc� pode se disconectar ou reconfigurar sua conex�o."
 
-#: ../../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."
@@ -6152,11 +5815,11 @@ msgstr ""
 "\n"
 "Voc� pode reconfigurar sua conex�o."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Voc� est� conectado � Internet."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -6164,102 +5827,53 @@ msgstr ""
 "\n"
 "Voc� pode se conectar � Internet ou reconfigurar sua conex�o."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Voc� n�o est� conectado � Internet."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Conectar � Internet"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Disconectar da Internet"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Configurar conex�o de rede (LAN ou Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Conex�o e configura��o da Internet"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Auxiliar de Configura��o da Rede"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Modem ISDN externo"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Placa ISDN interna"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "De que tipo � sua conex�o ISDN?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Conectar � 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 ""
-"A maneira mais comum de se conectar com adsl � pppoe.\n"
-"Mas algumas conex�es usam pptp, umas poucas usam dhcp.\n"
-"Se voc� n�o sabe, escolha 'usar pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "usar dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "usar pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "usar pptp"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "Eu reiniciarei o dispositivo de rede %s. Voc� concorda?"
-
-#: ../../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 ""
-"Qual cliente dhcp voc� quer usar?\n"
-"O padr�o � dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "Configura��o da Rede"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Voc� quer reiniciar a rede"
+"\n"
+"Voc� pode se disconectar ou reconfigurar sua conex�o."
 
-#: ../../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 ""
-"Um problema ocorreu reiniciando a rede: \n"
 "\n"
-"%s"
+"Voc� pode se disconectar ou reconfigurar sua conex�o."
+
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Configura��o da Rede"
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6271,7 +5885,7 @@ msgstr ""
 "Clique em Ok para manter sua configura��o, ou cancelar para reconfigurar sua "
 "conex�o de Internet & Rede.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6283,72 +5897,114 @@ msgstr ""
 "Estamos para configurar sua conex�o de rede/internet.\n"
 "Se voc� n�o quiser usar a auto detec��o, desmarque a op��o.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Escolha o perfil a configurar:"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Usar auto detec��o"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Detectando dispositivos..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Conex�o normal via modem"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "detectado na porta %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "Conex�o ISDN"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "detectado %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "Conex�o DSL (ou ADSL)"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "Cone��o LAN"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "detectado na interface %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Conex�o via cabo"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#, fuzzy
+msgid "cable connection detected"
+msgstr "Conex�o via cabo"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "Cone��o LAN"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "placa(s) ethernet detectada(s)"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Como voc� quer se conectar � Internet?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "Escolha a ferramente que voc� quer usar"
+
+#: ../../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 "Compartilhamento da Conex�o � Internet"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Voc� quer iniciar sua conex�o ao iniciar?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Configura��o da Rede"
+
+#: ../../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 ""
+"Um problema ocorreu reiniciando a rede: \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 ""
 "Parab�ns, a configura��o da rede e internet est� conclu�da.\n"
 "\n"
-"A configura��o agora ser� aplicada no seu sistema."
+"A configura��o agora ser� aplicada no seu 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."
@@ -6356,31 +6012,7 @@ msgstr ""
 "Quando isso terminar, n�s recomendados voc� a reiniciar o seu\n"
 "ambiente X para evitar o problema da mudan�a do nome do host."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "nenhuma placa de rede encontrada"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Configurando rede"
-
-#: ../../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 ""
-"Favor entrar com o nome do seu host (se voc� souber).\n"
-"Alguns servidores DHCP requerem o nome do host para funcionar.\n"
-"Seu nome do host deve ser um nome de host totalmente qualificado,\n"
-"como por exemplo ``mybox.mylab.myco.com''."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Host name (nome do host)"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6391,7 +6023,7 @@ msgstr ""
 "Apenas aceite para manter esse dispositivo configurado.\n"
 "A modifica��o dos campos abaixo ir� sobrepor essa configura��o."
 
-#: ../../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"
@@ -6401,38 +6033,38 @@ msgstr ""
 "Cada item deve ser entrando como endere�o IP pontilhado-decimal\n"
 "(por exemplo, 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 "Configurando dispositivo de rede %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (driver $module)"
+#: ../../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 "Endere�o IP"
 
-#: ../../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 "IP Autom�tico"
 
-#: ../../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 "O endere�o IP deve ser no formato 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"
@@ -6444,43 +6076,150 @@ msgstr ""
 "como por exemplo ``mybox.mylab.myco.com'' .\n"
 "Voc� tamb�m pode entrar como o endere�o IP de um gateway se voc� tiver um"
 
-#: ../../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 "Gateway"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Dispositivo de gateway"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Configura��o de proxies"
 
-#: ../../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 "O proxy deve ser http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "O proxy deve ser ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Configura��o da Internet"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Voc� quer tentar se conectar � Internet agora?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Testando sua conex�o..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "O sistema est� conectado � Internet."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Por raz�o de seguran�a, voc� ser� desconectado agora."
+
+#: ../../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 ""
+"O sistema n�o est� conectado � internet.\n"
+"Tente reconfigurar sua conex�o."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Configura��o da Conex�o"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Favor preencher ou marcar os campos abaixo"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ da Placa"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Mem�ria da Placa (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "IO da Placa"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "IO_O da Placa"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "IO_1 da Placa"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "O n�mero do seu telefone"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Nome do provedor (ex: provedor.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "N�mero do telefone do provedor"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "DNS 1 do provedor (opcional)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "DNS 2 do provedor (opcional)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Escolha seu teclado"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Modo de discagem"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+#, fuzzy
+msgid "Connection speed"
+msgstr "Tipo de conex�o: "
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Tipo de conex�o: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Nome da conta (nome do usu�rio)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Senha da conta"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Parti��o extendida n�o suportada nessa plataforma"
 
-#: ../../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 "
@@ -6490,26 +6229,21 @@ msgstr ""
 "A �nica solu��o � mover suas parti��es prim�rias para ter o buraco pr�ximo "
 "das parti��es extendidas"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Erro lendo arquivo %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Restaura��o pelo arquivo %s falhou: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Arquivo de backup defeituoso"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Erro gravando no arquivo %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"
@@ -6539,49 +6273,213 @@ msgstr "bom"
 msgid "maybe"
 msgstr "talvez"
 
-#: ../../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 "Sevidor CUPS remoto"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Servidor lpd remoto"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Impressora da rede (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 "Servidor de Impress�o"
 
-#: ../../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 "Dispositivo de Impress�o 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 "(m�dulo %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Selecionar Cone��o da Impressora"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Como a impressora est� conetada?"
+
+#: ../../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 ""
+"Com um servidor CUPS remoto, voc� n�o tem que configurar\n"
+"nenhuma impressora aqui; elas ser�o detectadas automaticamente.\n"
+"Se tiver d�vida, selecione \"Servidor CUPS remoto\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+#, fuzzy
+msgid "None"
+msgstr "Pronto"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Escolha o usu�rio:"
+
+#: ../../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 "Fechar"
+
+#: ../../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 "O endere�o IP deve ser no formato 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "O n�mero da porta deve ser num�rico"
+
+#: ../../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 do servidor CUPS"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Porta"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Configura��o do estilo de inicializa��o"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Detectando dispositivos..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Testar portas"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Uma impressora, modelo \"%s\", foi detectado no "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Dispositivo da 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"
@@ -6589,37 +6487,60 @@ msgstr ""
 "A qual dispositivo sua impressora est� conectada \n"
 "(note que /dev/lp0 � equivalente a LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Dispositivo da 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 "Lendo banco de dados de drivers do CUPS"
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Op��es da 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 ""
 "Para usar uma fila de impress�o lpd remota, voc� precisa\n"
 "dar o nome do host e o servidor de impress�o e o nome da\n"
-" fila naquele servidor na qual as impress�es serem enviadas."
+"fila naquele servidor."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "Nome do host remoto"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Fila remota"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Impressora remota"
+
+#: ../../printerdrake.pm_.c:320
+#, fuzzy
+msgid "Remote host name missing!"
+msgstr "Nome do host remoto"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Nome do host remoto"
+
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Op��es de Impress�o 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"
@@ -6635,29 +6556,37 @@ msgstr ""
 "qualquer informa��o aplic�vel sobre nome de usu�rio, senha e grupo de "
 "trabalho."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "Host servidor SMB"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP do servidor SMB"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Nome compartilhado"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Grupo de trabalho"
 
-#: ../../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 "Op��es de Impress�o 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."
@@ -6667,60 +6596,228 @@ msgstr ""
 "do host TCP/IP!) como tamb�m o nome da fila de impress�o para a impressora\n"
 "que voc� deseja acessar como qualquer nome de usu�rio e senha aplic�vel."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Servidor de Impress�o"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Nome da Fila de Impress�o"
 
-#: ../../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 "Op��es da Impressora 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 ""
 "Para imprimir em uma impressora socket, voc� precisa prover\n"
 "o nome do host da impressora e a n�mero da porta (opcional)."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Nome do host da impressora"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Porta"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "Nome do host da impressora"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Dispositivo de Impress�o URI"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with 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 ""
-"Voc� pode diretamente especificar o URI para acessar a impressora com CUPS"
 
-#: ../../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 "Nome da impressora"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Descri��o"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Lugar"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Lendo banco de dados de drivers do CUPS"
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "Conex�o da Impressora"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "Qual tipo de impressora voc� tem?"
 
-#: ../../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 "Configura��o da 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 "Configura��o da 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 "Voc� quer testar a impress�o?"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Testar portas"
+
+#: ../../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 "Sim, imprimir ambas as p�ginas de teste"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "Impressora"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Padr�o"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Imprimindo p�gina(s) de teste..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "Imprimindo p�gina(s) de teste..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Imprimindo p�gina(s) de teste..."
 
-#: ../../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 ""
 "A pagina de teste foi mandado ao dem�nio de impress�o,\n"
 "pode demorar um pouco at� a impressora come�ar.\n"
@@ -6729,237 +6826,603 @@ msgstr ""
 "\n"
 "A impress�o funcionou corretamente?"
 
-#: ../../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 ""
 "A pagina de teste foi mandado ao dem�nio de impress�o,\n"
 "pode demorar um pouco at� a impressora come�ar.\n"
 "A impress�o funcionou corretamente?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Sim, imprimir p�gina de teste ASCII"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Sim, imprimir p�gina de teste PostScript"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Nenhuma impressora"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Sim, imprimir ambas as p�ginas de teste"
+#: ../../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 "Configurar 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 "Fechando (desconectando) a rede"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Op��es da impressora"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Tamanho do Papel"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "Lendo banco de dados de drivers do CUPS"
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Ejetar p�gina ap�s a impress�o?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Configura��o da Internet"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Op��es do driver 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 "Op��es do n�mero de cores"
+#: ../../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 "Imprimir texto como 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 "Corrigir texto 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 "N�mero de p�ginas conforme p�ginas de sa�da"
+#: ../../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 "Margem Direita/Esquerda em pontos (1/72 de polegada)"
+#: ../../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 "Margem Superior/Inferior em pontos (1/72 de polegada)"
+#: ../../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 "Op��es extras de GhostScript"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Op��es extras de Texto"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Inverter a ordem das p�ginas"
+#: ../../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 "Voc� gostaria de configurar uma impressora?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "O nome da impressora deve conter apenas letras, n�meros e o s�mbolo _"
 
-#: ../../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 "Nenhuma impressora"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
 msgstr ""
-"Aqui est�o as filas de impress�o.\n"
-"Voc� pode adicionar mais ou modificar as existentes."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "Iniciando 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 "Lendo banco de dados de drivers do CUPS"
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Selecionar Cone��o da Impressora"
+#: ../../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 "Como a impressora est� conetada?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Iniciando sua conex�o..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Selecionar cone��o da impressora remote"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Configurar rede"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitor n�o configurado"
+
+#: ../../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 ""
-"Com um servidor CUPS remoto, voc� n�o tem que configurar\n"
-"nenhuma impressora aqui; elas ser�o detectadas automaticamente.\n"
-"Se tiver d�vida, selecione \"Servidor CUPS remoto\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Configurando rede"
+
+#: ../../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 ""
-"Com um servidor CUPS remoto, voc� n�o tem que configurar\n"
-"nenhuma impressora aqui; elas ser�o detectadas automaticamente\n"
-"a n�o ser que voc� tenha um servidor em uma rede diferente;\n"
-"nesse �ltimo caso, voc� tem que dar o endere�o IP do\n"
-"servidor CUPS e opcionalmente o n�mero da porta."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "IP do 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 "O n�mero da porta deve ser num�rico"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Qual sistema de impress�o voc� quer usar?"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Fila remota"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Alto"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paran�ico"
+
+#: ../../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"
-msgstr "O nome da impressora deve conter apenas letras, n�meros e o s�mbolo _"
+"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 "Qual sistema de impress�o voc� quer usar?"
+
+#: ../../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 precisa de um nome (por exemplo\n"
-"lp). Outros par�metros, tal como a descri��o da impressora ou sua\n"
-"localiza��o pode ser definida. Qual nome deve ser usado para essa\n"
-"impressora e como a impressora est� conectada?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Nome da 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 "Descri��o"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Lugar"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "Selecionar Cone��o da Impressora"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Qual sistema de impress�o voc� quer usar?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Configurar Impressora"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Op��es da impressora"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Lendo banco de dados de drivers do CUPS"
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "Voc� gostaria de configurar uma impressora?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
+msgid ""
+"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 ""
+
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Modo Normal"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Default)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Sevidor CUPS remoto"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Sevidor CUPS remoto"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+msgid "Add printer"
+msgstr "Nenhuma impressora"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Voc� quer testar a configura��o?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Configura��o da Internet"
 
-#: ../../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 ""
-"Cada fila de impress�o (a qual as impress�es s�o direcionadas) precisa\n"
-"de um nome (normalmente lp) e de um diret�rio spoll associado a ela.\n"
-"Qual o nome e diret�rio deve ser utilizado para esta fila e como a "
-"impressora est� conectada?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Nome da fila de impress�o"
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Diret�rio spool"
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Compartilhamento da Conex�o � Internet"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
 msgstr "Conex�o da 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 "Imprimindo p�gina(s) de teste..."
+
+#: ../../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 "Lendo banco de dados de drivers do 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 "Voc� quer reiniciar a rede"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Lendo banco de dados de drivers do CUPS"
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "Configura��o de proxies"
+
+#: ../../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 "Porta"
+
+#: ../../proxy.pm_.c:44
+#, fuzzy
+msgid "Url should begin with 'http:'"
+msgstr "O proxy deve ser http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+#, fuzzy
+msgid "The port part should be numeric"
+msgstr "O n�mero da porta deve ser num�rico"
+
+#: ../../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 "O proxy deve 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 "Autologin"
+
+#: ../../proxy.pm_.c:82
+#, fuzzy
+msgid "password"
+msgstr "Senha"
+
+#: ../../proxy.pm_.c:84
+#, fuzzy
+msgid "re-type password"
+msgstr "Nenhuma senha"
+
+#: ../../proxy.pm_.c:88
+#, fuzzy
+msgid "The passwords don't match. Try again!"
+msgstr "As senhas n�o conferem"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "N�o posso adicionar parti��o ao RAID _formatado_ md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "N�o posso gravar arquivo $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "N�o posso gravar arquivo %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid falhou"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid falhou (talvez o raidtools esteja faltando)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Sem parti��es suficientes para RAID n�vel %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr "Iniciar o sistema de som ALSA (Arquitetura Avan�ada de Som Linux)"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, um agendador de comando peri�dicos"
 
-#: ../../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."
@@ -6968,7 +7431,7 @@ msgstr ""
 "Ele tamb�m pode ser usado para desligar a m�quina quando a bateria estiver "
 "fraca."
 
-#: ../../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."
@@ -6977,7 +7440,7 @@ msgstr ""
 "at estava rodando, e executa comandos grupos de comandos quando o uso de "
 "mem�ria estiver baixo o suficiente."
 
-#: ../../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 "
@@ -6989,7 +7452,7 @@ msgstr ""
 "UNIX\n"
 "cron b�sico, incluindo melhor seguran�a e melhores op��es de configura��o."
 
-#: ../../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 "
@@ -7001,7 +7464,7 @@ msgstr ""
 "utilizando\n"
 "o mouse e inclui suporte para menus pop-up no console."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
@@ -7009,7 +7472,7 @@ msgstr ""
 "HardDrake executa uma detec��o do hardware existente, e\n"
 "opcionalmente configura um novo/alterado hardware."
 
-#: ../../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."
@@ -7017,7 +7480,7 @@ msgstr ""
 "Apache � um servidor World Wide Web. Ele � usado para servir arquivos\n"
 "HTML e 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 "
@@ -7034,7 +7497,7 @@ msgstr ""
 "inetd, todos os servi�os pela qual ele � respons�vel tamb�m s�o "
 "desabilitados."
 
-#: ../../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."
@@ -7042,7 +7505,7 @@ msgstr ""
 "Iniciar filtro de pacots para kernel Linux s�rie 2.2, para criar\n"
 "um firewall para proteger sua m�quina de ataques de rede."
 
-#: ../../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"
@@ -7053,7 +7516,7 @@ msgstr ""
 "utilit�rio kbdconfig. Voc� deve deixar isso ativar para a maioria da "
 "m�quinas."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
@@ -7061,11 +7524,11 @@ msgstr ""
 "Regenera��o autom�tica do heador do kernel no /boot para\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 "Detec��o e configura��o autom�tica do hardware na inicializa��o."
 
-#: ../../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."
@@ -7073,7 +7536,7 @@ msgstr ""
 "Linuxconf ir� periodicamente executar v�rias tarefas durante a\n"
 "inicializa��o para manter a configura��o do sistema"
 
-#: ../../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)."
@@ -7081,7 +7544,7 @@ msgstr ""
 "lpd � o daemon de impress�o requerido para o lpr funcionar corretamente.\n"
 "Ele � basicamente um servidor que organiza os trabalhos �(s) impressora(s)."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
@@ -7089,7 +7552,7 @@ msgstr ""
 "Servidor Virtual Linux, utilizado para criar um servidor de alta\n"
 "performance e alta acessibilidade."
 
-#: ../../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 +7560,7 @@ msgstr ""
 "named (BIND) � um Servidor de Nome de Dom�nio (DNS) que � usado para\n"
 "transformar nome de hosts para endere�os 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 +7568,7 @@ msgstr ""
 "Monta e desmonta todos os pontos de montagem do Network File\n"
 "System (NFS), SMB (Gerenciador de Rede/Windows) e 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 +7576,7 @@ msgstr ""
 "Ativa/Desativa todas as interfaces de rede configuradas para iniciar\n"
 "na hora de inicializa��o."
 
-#: ../../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 +7586,7 @@ msgstr ""
 "de redes TCP/IP. Esse servi�o prov� a funcionalidade do servidor NFS, que � "
 "configurado atrav�s do arquivo /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,7 +7594,7 @@ msgstr ""
 "NFS � um protocolo popular usado para compartilhar arquivos atrav�s de\n"
 "redes TCP/IP. Esse servi�o prov� a funcionalidade de trava de arquivos NFS."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
@@ -7139,11 +7602,11 @@ msgstr ""
 "Automaticamente ativa o Num Lock no console e XFree\n"
 "durante a inicializa��o."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr "Suporte para impressoras OKI-4w e compat�veis."
 
-#: ../../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 "
@@ -7155,7 +7618,7 @@ msgstr ""
 "estejaconfigurado,\n"
 "ent�o � seguro te-lo instalado em m�quinas que n�o precisam dele."
 
-#: ../../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 "
@@ -7167,7 +7630,7 @@ msgstr ""
 "m�quinas\n"
 "que ser�o os servidores para os protocolos que utilizam o mecanismo 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."
@@ -7175,7 +7638,7 @@ msgstr ""
 "Postfix � um Agente de Transporte de Correio, que � um programa\n"
 "que move mensagens entre uma m�quina e outra."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -7183,7 +7646,7 @@ msgstr ""
 "Salva e restaura o entropy pool do sistema para melhor qualidade\n"
 "na gera��o rand�mica de n�mero."
 
-#: ../../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"
@@ -7191,7 +7654,7 @@ msgstr ""
 "Determinar dispositivos raw como dispositovs de bloco\n"
 "(como parti��es), para o uso em aplicativos como o 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"
@@ -7202,7 +7665,7 @@ msgstr ""
 "rede, protocolos de roteamento mais complexos s�o necess�rios em redes mais "
 "complexas."
 
-#: ../../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."
@@ -7210,7 +7673,7 @@ msgstr ""
 "O protcolo rstat permite que us�rios da rede recebam\n"
 "informa��es sobre a perfomance de qualquer m�quina na rede."
 
-#: ../../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."
@@ -7218,7 +7681,7 @@ msgstr ""
 "O protocolo rusers pertmite que os usu�rios da rede identifiquem\n"
 "quem est� logado na m�quina correspondente do outro."
 
-#: ../../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)."
@@ -7226,11 +7689,11 @@ msgstr ""
 "O protocolo rwho permite que usu�rios remotos peguem uma lista de todos os\n"
 "usu�rios logados em uma m�quina rodando o daemon rwho (similar ao finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
 msgstr "Iniciar o sistema de som da sua m�quina"
 
-#: ../../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."
@@ -7238,34 +7701,72 @@ msgstr ""
 "Syslog � um aparato que muitos daemons usam para gravar mensagens\n"
 "em v�rios arquivos de log. � uma boa id�ia sempre rodar o syslog."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr "Carrega os drivers para seus dispositivos usb."
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr ""
 "Inicia o Servidor de Fontes X (� obrigat�rio para a execu��o do 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 ""
 "Escolha quais servi�os devem ser inicializados automaticamente na "
 "inicaliza��o"
 
+#: ../../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 "Modo do sistema"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Op��es da impressora lpd Remota"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Servidor, Bancos de dados"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "dispositivo"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "iniciado"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "parado"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Servi�os e daemons"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -7273,11 +7774,16 @@ msgstr ""
 "Nenhuma informa��o adicional\n"
 "sobre este servi�o, desculpe."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "No boot"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Instalando pacote %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"
@@ -7285,15 +7791,66 @@ msgstr ""
 "Eu n�o consigo ler sua tabela de parti��o, � muito defeituosa\n"
 "para mim. Eu irei tentar continuar limpando as parti��es defeituosas"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Erro"
+
+#: ../../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 "Configura��o p�s-instala��o"
+
+#: ../../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 "Configura��o do estilo de inicializa��o"
+
+#: ../../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 "Parab�ns!"
+
+#: ../../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 "Compartilhamento da Conex�o � Internet"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "O Compartilhamento da Conex�o � Internet est� ativo"
 
-#: ../../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"
@@ -7305,31 +7862,31 @@ msgstr ""
 "\n"
 "O que voc� gostaria de fazer?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "desativar"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "liberar"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "reconfigurar"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Desativando servidores..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "O Compartilhamento da Conex�o � Internet agora est� desativado."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "O Compartilhamento da Conex�o � Internet est� desativado"
 
-#: ../../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"
@@ -7341,27 +7898,19 @@ msgstr ""
 "\n"
 "O que voc� gostaria de fazer?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "ativar"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "Ativando servidores..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "O Compartilhamento da Conex�o � Internet agora est� ativo."
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "O conte�do do arquivo de configura��o n�o pode ser interpretado."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Arquivo de configura��o irreconhec�vel"
-
-#: ../../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 "
@@ -7377,21 +7926,21 @@ msgstr ""
 "Nota: voc� precisa de um Adaptador de Rede dedicado para criar um Rede Local "
 "(LAN)."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interface %s (usando m�dulo %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 "Nenhum adaptador de rede em seu 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."
@@ -7400,6 +7949,10 @@ msgstr ""
 "ferramenta de configura��o de hardware."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Interface de rede"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7414,28 +7967,29 @@ msgstr ""
 "\n"
 "Irei configurar sua Rede Local (LAN) com esse adaptador."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Favor escolher qual adaptador de rede ser� conectado � su Rede Local."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Aten��o, o adaptador de rede j� foi configurado. Eu irei reconfigur�-lo."
 
-#: ../../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 ""
-"Potencial conflinto de endere�o LAN encontra na configura��o atual de $_!\n"
+"Potencial conflinto de endere�o LAN encontra na configura��o atual de %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Configura��o de Firewall detectado!"
 
-#: ../../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."
@@ -7443,23 +7997,20 @@ msgstr ""
 "Aten��o! Uma configura��o de firewall foi detectada. Talvez voc� ter� que "
 "fazer alguma corre��o manual ap�s a instala��o."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Configurando..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Configurando scripts, instalando programas, iniciando servidores..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Problemas instalando pacote $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Parab�ns!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Problemas instalando pacote %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 "
@@ -7469,23 +8020,23 @@ msgstr ""
 "Voc� agora pode compartilhar sua conex�o com outros computadores na sua Rede "
 "Local (LAN), usando a configura��o autom�tica de rede (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "A configura��o j� foi feita, mas est� desativada."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "A configura��o j� foi feita e est� desativada."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "O Compartilhamento de Conex�o � Internet nunca foi configurado."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Configura��o do compartilhamento da Internet"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7500,83 +8051,82 @@ msgstr ""
 "\n"
 "Clique em ``Configurar'' se voc� quiser abrir o ajudante de configura��o."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Configura��o da Rede (%d adaptadores)"
 
-#: ../../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 "Apagar perfil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Perfil a apagar:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Novo perfil..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Nome do perfil a ser criado:"
+#: ../../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 "Hostname:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Acesso � Internet"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "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 "Conectado"
 
-#: ../../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 "N�o conectado"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Conectar..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Desconectar..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
 msgstr "Iniciando sua conex�o..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "Fechando sua conex�o..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7588,51 +8138,52 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "como root."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "O sistema agora est� conectado � Internet."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Configurar Acesso � Internet..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "Configura��o LAN"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adaptador"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Driver"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interface"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Status:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Configurar Rede Local (LAN)..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Modo Normal"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Por favor aguarde... Aplicando a configura��o"
 
-#: ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:428
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
@@ -7640,36 +8191,38 @@ msgstr ""
 "Voc� n�o possui nenhuma interface configurada.\n"
 "Configure-as primeiro clicando em 'Configurar'"
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "Configura��o 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 "Protocolo da inicializa��o"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Iniciado na inicializa��o"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "Cliente DHCP"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Desativar"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Ativo"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Ativar"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Ativo"
 
-#: ../../standalone/draknet_.c:504
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
@@ -7677,35 +8230,27 @@ msgstr ""
 "Voc� n�o possui nenhuma conex�o � Internet.\n"
 "Crie uma clicando em 'Configurar'"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Configura��o da conex�o � Internet"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Configura��o da conex�o � Internet"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Tipo de conex�o: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Par�metros"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "DNS 1 do provedor (opcional)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "DNS 2 do provedor (opcional)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Placa Ethernet"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "Cliente DHCP"
 
@@ -7780,15 +8325,30 @@ msgstr ""
 "fechado.\n"
 "As caracter�sticas de seguran�a est�o no m�ximo."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Op��es do n�vel de seguran�a"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Escolha as op��es do 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 "Op��es do n�vel de seguran�a"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Centro de Controle"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Escolha a ferramente que voc� quer usar"
 
@@ -7816,83 +8376,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Incapaz de iniciar a atualiza��o on-line!!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "nenhum usb_serial encontrado\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Deseja emula��o de 3 bot�es?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Favor testar o mouse"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "Monitoramento da Rede"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Estat�sticas"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "Velocidade de envio: "
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "Velocidade de recebimento: "
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Fechar"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "Conectando � Internet"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "Desconectando da Internet"
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "N�o foi poss�vel desconectar."
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "Desconectado da Internet"
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Conex�o completada."
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"A conex�o falhou:\n"
-"Verifique a sua configura��o no Centro de Controle Mandrake."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "enviados: "
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "recebidos: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Conectar"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Desconectar"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Configura��o de Firewall"
@@ -7923,21 +8414,89 @@ msgstr ""
 "\n"
 "Clique em configurar para criar um firewall padr�o"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Escolha seu idioma"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Selecione a classe da instala��o"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Detec��o de discos rigidos"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Configurar mouse"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Escolha seu teclado"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Seguran�a"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Setup dos sistemas de arquivos"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formatar parti��es"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Escolha pacotes a serem instalados"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Instalar sistema"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Adicionar um usu�rio"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Configurar rede"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Configurar servi�os"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Criar um disco de inicializa��o"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Instalar gerenciador de inicializa��o"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Configurar X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Sair da instala��o"
+
+#: ../../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 ""
 "configurador pequenoFirewall\n"
 "\n"
-"Isso configura um firewall pessoal para essa m�quina Linux Mandrake.\n"
+"Isso configura um firewall pessoal para essa m�quina Mandrake Linux.\n"
 "Para um firewall dedicado potente, favor procurar a distribui��o\n"
 "especilizada 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"
@@ -7955,7 +8514,7 @@ msgstr ""
 "dele. Voc� pode alterar essa configura��o a qualquer hora,\n"
 "basta re-executar esse aplicativo!"
 
-#: ../../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"
@@ -7967,7 +8526,7 @@ msgstr ""
 "precisa ser acessado por esta m�quina apenas, favor responder N�O aqui.\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"
@@ -7979,7 +8538,7 @@ msgstr ""
 "favor responder n�o.\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"
@@ -7993,7 +8552,7 @@ msgstr ""
 "n�o � codificada -- ent�o alguns agressores podem roubar sua senha.\n"
 "ssh � codificada e n�o permite esse tipo de roubo."
 
-#: ../../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"
@@ -8005,7 +8564,7 @@ msgstr ""
 "fortemente recomendamos responder N�o aqui e utilizar ssh no lugar\n"
 "da 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"
@@ -8017,7 +8576,7 @@ msgstr ""
 "apenas para transfer�ncias an�nimas. Qualquer senha enviada por FTP pode\n"
 "ser roubada por invasores, desde que FTP n�o usa codifica��o de senhas.\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"
@@ -8029,7 +8588,7 @@ msgstr ""
 "voc� provavelmente est�. Caso contr�rio, voc� deve retirar o firewall dele.\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"
@@ -8041,7 +8600,7 @@ msgstr ""
 "pessoas atrav�s desta m�quina.\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"
@@ -8053,7 +8612,7 @@ msgstr ""
 "escrit�rio (determinado dinamicamente), n�s precisamos permitir\n"
 "isso. � esse o caso?\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"
@@ -8067,7 +8626,7 @@ msgstr ""
 "parte de uma grande empresa ou nunca ouviu sobre isso, voc� \n"
 "provalvemente n�o est�."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -8079,47 +8638,59 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "N�o foi poss�vel abrir %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Erro arbindo %s para grava��o: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clientes para protocolos diferentes incluindo ssh"
+msgid "Web/FTP"
+msgstr "Servidor, Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Desenvolvimento"
+msgid "Network Computer (client)"
+msgstr "Computador de rede (cliente)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Esta��o de Trabalho"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH"
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Servidor, Firewall/Roteador"
+msgid "Office"
+msgstr "Escrit�rio"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Gereciador de Informa��o Pessoal"
+msgid "Gnome Workstation"
+msgstr "Esta��o de Trabalho Gnome"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multim�dia - Gr�ficos"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Ferramentas para o seu Palm Pilot e seu Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Workstation"
+msgstr "Esta��o de Trabalho"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computador de rede (cliente)"
+msgid "Firewall/Router"
+msgstr "Servidor, Firewall/Roteador"
+
+#: ../../share/compssUsers:999
+msgid "Domain Name and Network Information Server"
+msgstr "Nome do Dom�nio e Servidor de Informa��o da Rede"
+
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programas de escrit�rio: processadores de texto (kword, abiword), tabelas "
+"(kspread, gnumeric), visualizadores pdf, etc"
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
@@ -8127,241 +8698,1484 @@ msgstr ""
 "Ferramentas relacionadas � �udio: tocadores de mp3 ou midi, mixers, etc"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Esta��o de Internet"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livros e Howto's sobre Linux e Software Livre"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Escrit�rio"
+msgid "KDE Workstation"
+msgstr "Esta��o de Trabalho KDE"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Esta��o de 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 ""
-"Conjunto de ferramentas para ler e enviar mensagem e not�cias (pine, mutt, "
-"tin...) e para navegar na Web"
+"Conjunto de ferramentas para mensagens, not�cias, web, transfer�ncias de "
+"arquivos e bate-papo"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Bibliotecas de desenvolvimento C e C++, programas e arquivos include"
+msgid "Database"
+msgstr "Servidor, Bancos de dados"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Nome do Dom�nio e Servidor de Informa��o da Rede"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de banco de dados PostgreSQL ou MySQL"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programas para gerenciar seu dinheiro, como o gnucash"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Ferramentas para facilitar a configura��o do seu computador"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de banco de dados PostgreSQL ou MySQL"
+msgid "Multimedia - Sound"
+msgstr "Multim�dia - Som"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH"
+msgid "Utilities"
+msgstr "Utilit�rios"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "Documenta��o"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Console Tools"
+msgstr "Ferramentas do Console"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Utilit�rios"
+msgid "Postfix mail server, Inn news server"
+msgstr "Servidor de mensagens postfiz, servidor de not�cias Inn"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgid "Internet station"
+msgstr "Esta��o de Internet"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ambiente Gr�fico"
+msgid "Multimedia station"
+msgstr "Esta��o de Multim�dia"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multim�dia - Som"
+#, fuzzy
+msgid "Configuration"
+msgstr "Configura��o LAN"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de divertimento: arcade, estrat�gia, etc"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Mais Desktops Gr�ficos (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Editor e visualizadores de V�deo"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"O K Desktop Environment, o ambiente gr�fico b�sico acompanhando de uma "
+"cole��o de ferramentas"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Ferramentas do Console"
+msgid "Graphical Environment"
+msgstr "Ambiente Gr�fico"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programas editores/tocadores de som e v�deo"
+msgid "Development"
+msgstr "Desenvolvimento"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Esta��o de Trabalho Cient�fica"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache e Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, shells, ferramentas de arquivos, terminais"
+msgid "Tools to create and burn CD's"
+msgstr "Ferramentas para criar e gravar CD's"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livros e Howto's sobre Linux e Software Livre"
+msgid "Office Workstation"
+msgstr "Esta��o de Trabalho de Escrit�rio"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Um ambiente gr�fico com um conjunto de aplicativos e ferramenas de desktop "
-"amig�veis"
+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 "Servidor de mensagens postfiz, servidor de not�cias Inn"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programas gr�ficos como o The Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Jogos"
+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 "Bibliotecas de desenvolvimento C e C++, programas e arquivos include"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
 msgstr "Servidor de Rede"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programas gr�ficos como o The Gimp"
+msgid "Mail/Groupware/News"
+msgstr "Servidor, Correio/Groupware/News"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Esta��o de Trabalho de Escrit�rio"
+msgid "Game station"
+msgstr "Esta��o de Jogos"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"O K Desktop Environment, o ambiente gr�fico b�sico acompanhando de uma "
-"cole��o de ferramentas"
+msgid "Video players and editors"
+msgstr "Editor e visualizadores de V�deo"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Mais Desktops Gr�ficos (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multim�dia - Gr�ficos"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Ferramentas para criar e gravar CD's"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programas de divertimento: arcade, estrat�gia, etc"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multim�dia - Grava��o de CD"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Conjunto de ferramentas para ler e enviar mensagem e not�cias (pine, mutt, "
+"tin...) e para navegar na Web"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
 msgstr "Arquivamento, emuladores, monitoramento"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Servidor, Bancos de dados"
+msgid "Personal Finance"
+msgstr "Finan�a Pessoal"
 
 #: ../../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 ""
-"Programas de escrit�rio: processadores de texto (kword, abiword), tabelas "
-"(kspread, gnumeric), visualizadores pdf, etc"
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Servidor, Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Server"
-msgstr "servidor"
+"Um ambiente gr�fico com um conjunto de aplicativos e ferramenas de desktop "
+"amig�veis"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finan�a Pessoal"
+msgid "Clients for different protocols including ssh"
+msgstr "Clientes para protocolos diferentes incluindo ssh"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configura��o"
+msgid "Internet gateway"
+msgstr "Internet Gateway"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Esta��o de Trabalho KDE"
+msgid "Sound and video playing/editing programs"
+msgstr "Programas editores/tocadores de som e v�deo"
 
 #: ../../share/compssUsers:999
 msgid "Other Graphical Desktops"
 msgstr "Outros Desktops Gr�ficos"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache e Pro-ftpd"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editores, shells, ferramentas de arquivos, terminais"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Servidor, Correio/Groupware/News"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programas para gerenciar seu dinheiro, como o gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Esta��o de Trabalho Gnome"
+msgid "Games"
+msgstr "Jogos"
 
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet Gateway"
+msgid "Personal Information Management"
+msgstr "Gereciador de Informa��o Pessoal"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Ferramentas para o seu Palm Pilot e seu Visor"
+msgid "Multimedia - CD Burning"
+msgstr "Multim�dia - Grava��o de CD"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Esta��o de Jogos"
+msgid "Scientific Workstation"
+msgstr "Esta��o de Trabalho Cient�fica"
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "n�o foi poss�vel abrir /etc/sysconfig/autologin para leitura: %s"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Ferramentas para facilitar a configura��o do seu computador"
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Voc� quer reiniciar a rede"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr ""
-"Conjunto de ferramentas para mensagens, not�cias, web, transfer�ncias de "
-"arquivos e bate-papo"
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Voc� concorda?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Eu irei reiniciar o dispositivo de rede:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Eu reiniciarei o dispositivo de rede %s. Voc� concorda?"
+
+#, 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 ""
+#~ "A n�o ser que voc� saiba especificamente o contr�rio, a escolha comum �\n"
+#~ "\"/dev/hda\" (disco IDE mestre do canal prim�rio) ou \"/dev/sda"
+#~ "\"  (primeiro disco SCSI)."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Aqui est�o as filas de impress�o.\n"
+#~ "Voc� pode adicionar mais ou modificar as existentes."
+
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Tipo de conex�o: "
+
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Escolha o usu�rio:"
+
+#, fuzzy
+#~ msgid "Test the mouse here."
+#~ msgstr "Favor testar o mouse"
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr ""
+#~ "Favor escolher seu idioma preferido para a instala��o e utiliza��o do "
+#~ "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 ""
+#~ "Voc� precisa aceitar os termos da licen�a acima para continuar a "
+#~ "instala��o.\n"
+#~ "\n"
+#~ "\n"
+#~ "Favor clicar em \"Aceitar\" se voc� concordar com ela.\n"
+#~ "\n"
+#~ "\n"
+#~ "Favor clicar em \"Recusar\" se voc� n�o concorda com ela. A instala��o "
+#~ "ser� cancelada sem modificar a sua configura��o\n"
+#~ "atual."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr ""
+#~ "Escolha o tipo de layout correspondente ao seu teclado na lista acima"
+
+#~ 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 ""
+#~ "Se voc� desejar, outros idiomas (al�m do que voc� escolheu\n"
+#~ "no in�cio da instala��o) estar�o dispon�veis ap�s a instala��o, favor "
+#~ "escolh�-los\n"
+#~ "na lista acima. Se voc� quiser todos, voc� precisa apenas selecionas "
+#~ "\"Todos\"."
+
+#~ 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 ""
+#~ "Selecione:\n"
+#~ "\n"
+#~ "  - Personalizado: Se voc� j� est� familiarizado com o GNU/Linux, voc� "
+#~ "poder� escolher\n"
+#~ "    a utiliza��o prim�ria de sua m�quina. Veja abaixo para detalhes.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Expert: Se voc� � fluente com o GNU/Linux e quer fazer uma\n"
+#~ "    instala��o altamente personalizada. Como na classe de instala��o "
+#~ "\"Personalizado\",\n"
+#~ "    voc� poder� escolher a utiliza��o do seu sistema.\n"
+#~ "    Mas por favor, N�O ESCOLHA ESSE A N�O SER QUE VOC� SAIBA O QUE VOC� "
+#~ "EST� FAZENDO!"
+
+#~ 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 ""
+#~ "Voc� agora deve definir a utiliza��o de sua m�quina. As escolhas s�o:\n"
+#~ "\n"
+#~ "* Esta��o de Trabalho: essa � a escolha idel se voc� pretende usar sua "
+#~ "m�quina basicamente para uso di�rio, no\n"
+#~ "  escrit�rio ou em casa.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Desenvolvimento: se voc� pretense usar sua m�quina primariamente para "
+#~ "desenvolver software, essa � uma boa escolha.\n"
+#~ "  Voc� ter� instalado todo os softwares necess�rios para se compilar, "
+#~ "debugar e editar c�digo fonte,\n"
+#~ "  ou criar pacotes de software.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Servidor: se voc� pretende usar essa m�quina como servidor, essa � uma "
+#~ "boa escolha. Tanto como servidor de\n"
+#~ "  arquivos (NFS ou SMB), de impress�o (estilo Unix ou Microsoft Windows), "
+#~ "um servidor de autentica��o (NIS), um\n"
+#~ "  banco de dados e assim por diante. Como tal, n�o espere que acess�rios "
+#~ "(KDE, GNOME, etc) sejam instalados."
+
+#~ 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 ""
+#~ "Voc� pode selecionar o grupo de pacotes que voc�\n"
+#~ "desejar instalar ou atualizar.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ent�o, DrakX verificar� se voc� tem espa�o suficientes para instal�-los."
+#~ "Se n�o,\n"
+#~ "voc� ser� avisado. Se voc� quiser continuar, voc� poder� proceder para a\n"
+#~ "instala��o de todos os grupos selecionados mas alguns grupos de menor\n"
+#~ "interesse n�o ser�o instalados. No fim da lista voc� pode selecionar \n"
+#~ "a op��o \"Sele��o individual de pacotes\"; nesse caso voc� poder� "
+#~ "navegar\n"
+#~ "entre mais de 1000 pacotes..."
+
+#~ 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 ""
+#~ "Voc� agora pode selecionar individualmente todos os\n"
+#~ "pacotes que voc� deseja instalar.\n"
+#~ "\n"
+#~ "\n"
+#~ "Voc� pode expandir ou colapsar a �rvore clicando na op��o no canto "
+#~ "esquerdo da\n"
+#~ "janelas de pacotes.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� quiser ver os pacotes em ordem alfab�tica, clique no �cone\n"
+#~ "\"Ativar"
+
+#~ 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 ""
+#~ "Se voc� tiver todos os CDs da lista acima, clique em Ok. Se voc�\n"
+#~ "n�o tiver nenhum desses CDs, clique em Cancelar. Se apenas alguns CDs "
+#~ "estiverem,\n"
+#~ "faltando, desmarque-os e ent�o clique em 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 ""
+#~ "Se voc� deseja conectar seu computador � Internet ou\n"
+#~ "� uma rede local, escolha a op��o correta. Favor ativar o seu dispositivo "
+#~ "antes\n"
+#~ "de escolher a op��o correta de deixar o DrakX detect�-lo "
+#~ "automaticamente.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� n�o tiver nenhuma conex�o � Internet ou a uma rede local, "
+#~ "escolha\n"
+#~ "\"Desabilitar rede\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� deseja configurar sua rede depois da instala��o ou se voc� tiver "
+#~ "terminado\n"
+#~ "de configurar sua conex�o � rede, escolha \"Pronto\"."
+
+#~ 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 ""
+#~ "Nenum modem foi detectado. Favor escolher a porta serial em que seu modem "
+#~ "est� conectado.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nota, a primeira porta serial (chamada \"COM1\" no Microsoft Windows)\n"
+#~ "� chamada \"ttyS0\" no 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 ""
+#~ "Voc� pode agora configurar a rede dialup. Se voc�\n"
+#~ "n�o sabe ou n�o tem certeza sobre o que colocar, as informa��es corretas "
+#~ "podem\n"
+#~ "ser obtidas com o seu Provedor de Intenet. Se voc� n�o digitar o DNS \n"
+#~ "(nome do servidor) aqui, essa informa��o ser� obtida com o seu Provedor "
+#~ "de Internet\n"
+#~ "na hora da conex�o."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Se o seu modem for um modem externo, favor lig�-lo agora para deixar "
+#~ "odetect�-lo automaticamente."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Favor ligar o seu modem e escolha o correto."
+
+#~ 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 ""
+#~ "Se voc� n�o tem certeza se as informa��es acima\n"
+#~ "est�o corretas ou se voc� n�o sabe ou n�o tem certeza sobre o que "
+#~ "colocar,\n"
+#~ "as informa��es corretas podem ser obtidas com o seu Provedor de Internet. "
+#~ "Se voc�\n"
+#~ "n�o digitar o DNS (nome do servidor) aqui, essa informa��o ser� obtida "
+#~ "com o seu\n"
+#~ "Provedor de Internet na hora da conex�o."
+
+#~ 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 ""
+#~ "Agora voc� pode entrar com o nome do host, se necess�rio. Se voc�\n"
+#~ "n�o tem certeza sobre o que colocar, a informa��o correta pode ser "
+#~ "obtida\n"
+#~ "com o seu provedor."
+
+#~ 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 ""
+#~ "Voc� pode agora configurar seu dispositivo de rede:\n"
+#~ "\n"
+#~ "   * Endere�o IP: se voc� n�o saber qual �, pergunte ao administrador da "
+#~ "rede.\n"
+#~ "     Voc� n�o pode entrar com um n�mero IP se voc� selecionar a op��o "
+#~ "\"IP Autom�tico\" abaixo.\n"
+#~ "\n"
+#~ "   * Netmask: \"255.255.255.0\" � normalmente uma boa escolha. Se voc� "
+#~ "n�o tem certeza sobre o que colocar,\n"
+#~ "     pergunte ao administrador da rede.\n"
+#~ "\n"
+#~ "   * IP Autom�tico: se sua rede usa o protocolo BOOTP ou DHCP, selecione "
+#~ "essa op��o. Se selecionada, nenhum valor � necess�rio em \n"
+#~ "    \"Endere�o IP\". Se voc� n�o tem certeza se deve selecionar essa "
+#~ "op��o, pergunte ao administrador de rede."
+
+#~ 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 ""
+#~ "Voc� pode agora colocar o nome do seu host, se necess�rio.\n"
+#~ " Se voc� n�o sabe sobre o que colocar, pergunte ao administrador da rede."
+
+#~ 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 ""
+#~ "Voc� pode agora colocar o nome do host, se necess�rio.\n"
+#~ "Se voc� n�o sabe ou n�o ter certeza, deixe em branco."
+
+#~ 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 ""
+#~ "Agora voc� pode entrar com as op��es dialup. Se voc� n�o tem certeza "
+#~ "sobre\n"
+#~ "o que colocar, a informa��o correta pode ser obtida com o seu provedor."
+
+#~ 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 voc� ir� usar proxies, favor configur�-los agora. Se voc� n�o sabe se\n"
+#~ "ir� usar proxies, pergunte ao seu administrador de rede ou ao seu "
+#~ "provedor."
+
+#~ 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 ""
+#~ "Voc� pode instalar o pacote criptogr�fico se sua conex�o com a internet "
+#~ "foi\n"
+#~ "configurada corretamente. Primeiro, escolha um espelho de onde voc� "
+#~ "deseja fazer\n"
+#~ "o download dos pacotes e ap�s isso, selecione os pacotes a serem "
+#~ "instalados.\n"
+#~ " \n"
+#~ "\n"
+#~ "Note que voc� deve escolher o mirror (espelho) e pacotes criptogr�fico "
+#~ "de\n"
+#~ "acordo com a sua legisla��o."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr ""
+#~ "Voc� agora pode escolher seu fuso hor�rio de acordo com onde voc� vive"
+
+#~ 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 ""
+#~ "Voc� pode configurar uma impressora local (conectada ao seu computador),\n"
+#~ "ou remota (acess�vel via uma rede Unix, Netware ou 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 ""
+#~ "Se voc� quer estar capaz de imprimir, favor escolher um sistema de "
+#~ "impress�o\n"
+#~ "entre o CUPS e o LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS � um novo, poderoso e flex�vel sistema de impress�o para sistema "
+#~ "UNIX\n"
+#~ "(CUPS significa \"Common Unix Printing System\"). Esse � o sistema de "
+#~ "impress�o\n"
+#~ "padr�o do Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR � um velho sistema de impress�o usado em antigas distribui��es "
+#~ "Mandrake Linux.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� n�o tem nenhuma impressora, clique em \"Nenhuma\"."
+
+#~ 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 pode lidar com v�rios tipos de impressoras. Cada uma requer "
+#~ "uma\n"
+#~ "configura��o diferente.\n"
+#~ "\n"
+#~ "\n"
+#~ "Se sua impressora � fisicamente conectada ao seu computador, selecione\n"
+#~ "impressora \"Local\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� deseja acessar uma impressora localizada em uma m�quina Unix "
+#~ "remota,\n"
+#~ "selecione \"Impressora Remota\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Se voc� deseja acessar uma impressora localizada em uma m�quina Microsoft "
+#~ "Windows\n"
+#~ "remota (ou uma m�quina Unix usando protocolo SMB), selecione \"SMB/"
+#~ "Windows95/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 ""
+#~ "Favor ligar a sua impressora antes de deixar o DrakX tentar detect�-la.\n"
+#~ "\n"
+#~ "Voc� tem que colocar algumas informa��es aqui.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Nome da impressora: o spooler de impress�o usa \"lp\" como o nome "
+#~ "padr�o.Ent�o, voc� tem que ter uma impressora chamada\n"
+#~ "     \"lp\". Se voc� tem apenas uma impressora, voc� pode usar v�rios "
+#~ "nomespara ela. Voc� precisa apenas separ�-los por um\n"
+#~ "     caractere pipe (um \"|\"). Ent�o, se voc� preferir um nome mais "
+#~ "significante, voc� tem que coloc�-lo primeiro,\n"
+#~ "     ex: \"Minha impressora|lp\". A impressora com o nome \"lp\" ser� a "
+#~ "impressora padr�o.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Descri��o: esse � opcional, mas pode ser �til se v�rias impressoras "
+#~ "est�o conectadas ao seu computador ou se\n"
+#~ "     voc� permite que outros computadores acessem essa impressora.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Localiza��o: se voc� quiser colocar alguma informa��o sobre a\n"
+#~ "     localiza��o da impressora, coloque aqui (voc� pode escrever o que\n"
+#~ "     quiser, por exemplo \"Segundo andar\").\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 ""
+#~ "Voc� precisa colocar algumas informa��es aqui.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Nome da fila: o spooler de impress�o usa \"lp\" como o nome padr�o."
+#~ "Ent�o, voc� tem que ter uma impressora chamada\n"
+#~ "     \"lp\". Se voc� tem apenas uma impressora, voc� pode usar v�rios "
+#~ "nomespara ela. Voc� precisa apenas separ�-los por um\n"
+#~ "     caractere pipe (um \"|\"). Ent�o, se voc� preferir um nome mais "
+#~ "significante, voc� tem que coloc�-lo primeiro,\n"
+#~ "     ex: \"Minha impressora|lp\". A impressora com o nome \"lp\" ser� a "
+#~ "impressora padr�o.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Diret�rio spool: � o diret�rio onde os trabalhos de impress�o s�o "
+#~ "armazenados. Mantenha a\n"
+#~ "     escolha padr�o se voc� n�o sabe o que usar\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Conex�o da impressora: Se sua impressora estiver conectada "
+#~ "fisicamente ao seu computador, escolha \"Impressora\n"
+#~ "     Local\". Se voc� quiser acessar um impressora conectada a uma "
+#~ "m�quina Unix remota, escolha \"Impressora ldp remota\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Se voc� quiser acessar uma impressora localizada em uma m�quina "
+#~ "Microsoft Windows remota (ou UNIX usando o protocolo\n"
+#~ "     SMB), selecione \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Se voc� quiser accear uma impressora localizada em uma rede Netware, "
+#~ "selecione \"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 ""
+#~ "Sua impressora n�o foi detectada. Favor digitar o nome do dispositivo a\n"
+#~ "qual est� conectada.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nota, a maioria das impressoras est�o conectadas � primeira porta "
+#~ "paralela.\n"
+#~ "Ela � chamada \"/dev/lp0\" no GNU/Linux e \"LPT1\" no MicrosoftWindows."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Voc� agora deve selecionar sua impressora da lista acima."
+
+#~ 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 ""
+#~ "Favor selecionar as op��es corretas de acordo com a sua impressora.\n"
+#~ "Favor verificar a documenta��o dela se voc� n�o sabe o que escolher "
+#~ "aqui.\n"
+#~ "\n"
+#~ "\n"
+#~ "Voc� poder� testar a sua configura��o no pr�ximo passo e voc� ser� capaz "
+#~ "de modific�-la se n�o estiver funcionando do jeito que voc� quer."
+
+#~ 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 ""
+#~ "Agora voc� deve entrar com a senha root do seu sistema Mandrake Linux.\n"
+#~ "A senha deve ser digitada duas vezes para verificar se as senhas\n"
+#~ "digitadas s�o id�nticas.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root � o administrador do sistema, e � o �nico usu�rio que pode "
+#~ "modificar\n"
+#~ "a\n"
+#~ "configura��o do sistema. Ent�o escolha a senha com cuidado\n"
+#~ "Uso n�o-autorizado da conta root pode ser extremamente perigoso\n"
+#~ "� integridade\n"
+#~ "do sistema e seus dados, e outros sitemas conectados a ele.\n"
+#~ "\n"
+#~ "\n"
+#~ "A senha deve ser uma mistura de caracteres alfa-num�ricos com no m�nimo "
+#~ "8\n"
+#~ "caracteres. Ela nunca deve ser anotada.\n"
+#~ "\n"
+#~ "\n"
+#~ "N�o fa�a a senha muito grande ou muito complicada, voc� tem que ser "
+#~ "capaz\n"
+#~ "de lembrar dela sem muita dificuldade."
+
+#~ 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 ""
+#~ "Agora voc� pode criar uma ou mais contas de usu�rios \"regulares\"\n"
+#~ "que s�o opostas � conta \"privil�giada\" do root. Voc� pode criar uma\n"
+#~ "ou mais contas para cada pessoa que voc� quer permitir usar esse\n"
+#~ "computador. Note que cada conta de usu�rio tem suas pr�prias "
+#~ "prefer�ncias\n"
+#~ "(ambiente gr�fico, configura��o de progrmas, etc.) e seu pr�prio\n"
+#~ "\"diret�rio home\" que � o local onde essas prefer�ncias ir�o ser\n"
+#~ "guardadas.\n"
+#~ "\n"
+#~ "\n"
+#~ "Em primeiro lugar, crie uma conta para voc� mesmo! Mesmo que voc� seja o "
+#~ "�nico usu�rio\n"
+#~ "da m�quina, voc� N�O pode se conectar como root no uso di�rio desse "
+#~ "sistema:\n"
+#~ "� um risco muito grande. Deixar o sistema defeituoso pode ser causado por "
+#~ "erro de digita��o\n"
+#~ "\n"
+#~ "\n"
+#~ "Al�m do mais, voc� deve se conectar ao sistema usando a conta de usu�rio\n"
+#~ "que voc� criou aqui, e se logar como root somente para prop�sitos de\n"
+#~ "manuten��o e administra��o."
+
+#~ 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 ""
+#~ "A cria��o de um disco de inicializa��o � altamente recomendada.\n"
+#~ "Se voc� n�o conseguir inicializar o seu computador, � a �nica maneira\n"
+#~ "de resgatar o seu sistema sem ter que reinstal�-lo."
+
+#~ 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 ""
+#~ "As principais op��es do LILO e do grub s�o:\n"
+#~ "  - Dispositivo de boot: Indica o nome do dispositivo (ex.: uma parti��o\n"
+#~ "do disco r�gido) que cont�m o setor de boot. A n�o ser que voc� saiba\n"
+#~ "exatamente o que est� fazendo, escolha \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Tempo de espera antes do boot padr�o: Especifica o tempo em d�cimos\n"
+#~ "de segundo que o gerenciador de inicializa��o deve esperar antes de "
+#~ "entrar\n"
+#~ "na imagem padr�o. Isso � �til em sistemas que fazem o boot imediato do\n"
+#~ "disco r�gido depois de ativar o teclado. O gerenciador de inicializa��o "
+#~ "n�o\n"
+#~ "esperar� se  \"delay\" for omitido ou com o valor zero.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Modo do v�deo: Isso especifica o modo de texto VGA que deve ser\n"
+#~ "selecionado durante o boot. Os seguintes valores s�o dispon�veis: \n"
+#~ "\n"
+#~ "    * normal: seleciona o modo de texto normal 80x25.\n"
+#~ "\n"
+#~ "    * <n�mero>: usa o modo de texto correspondente.\n"
+#~ "\n"
+#~ "  - Limpar \"/tmp\" a cada inicializa��o: se voc� quiser apagar todos os "
+#~ "arquivos\n"
+#~ "e diret�rios em \"/tmp\" quando iniciar o sistema, marque essa op��o.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Especificar RAM se necess�rio: infelizmente, n�o existe um m�todo "
+#~ "padr�o\n"
+#~ "para perguntar o BIOS a RAM existente no seu computador. Como "
+#~ "consequ�ncia, o Linux\n"
+#~ "pode falhar na detec��o correta da RAM. Se esse for o caso, voc� pode\n"
+#~ "especificar a quantidade correta de RAM. Note que uma diferen�a de 2 ou "
+#~ "4\n"
+#~ "MB entre a RAM detectada e a existente no seu sistema � 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 ""
+#~ "SILO � um gerenciado de boot para SPAR: � capaz de\n"
+#~ "de inicializar tanto no GNU/Linux quanto qualquer outro sistema\n"
+#~ "operacional instalado. Normalmente, esses sistemas s�o detectados e\n"
+#~ "instalados corretamente. Se esse n�o for o caso, voc� pode adicionar\n"
+#~ "entradas manualmente nessa tela. Cuidado ao escolher os par�metros "
+#~ "corretos.\n"
+#~ "\n"
+#~ "\n"
+#~ "Voc� pode tamb�m n�o dar acesso a esses sistemas operacionais para\n"
+#~ "ningu�m, na qual voc� pode deletar as entradas correspondentes. Mas "
+#~ "nesse\n"
+#~ "caso, voc� precisar� de um disco de inicializa��o para poder utiliz�-los!"
+
+#~ 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 ""
+#~ "As principais op��es do SILO s�o:\n"
+#~ "  - Instala��o do gerenciador de inicializa��o: Indicar aonde voc� quer\n"
+#~ "colocar a informa��o requerida para entrar no GNU/Linux. A n�o ser que\n"
+#~ "voc� saiba o que faz, escolha \"Primeiro setor do drive (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Tempo de espera antes do boot padr�o: Especifica o tempo em d�cimos\n"
+#~ "de segundo que o gerenciador de inicializa��o deve esperar antes de "
+#~ "entrar\n"
+#~ "na primeira imagem. Isso � util em sistema que fazem a inicializa��o\n"
+#~ "imediata do disco r�gido antes de ativar o teclado. O gerenciador de\n"
+#~ "inicializa��o n�o ir� esperar se  \"delay\" estiver omitido ou com o\n"
+#~ "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 ""
+#~ "Agora � hora de configurar o Sistema de Janelas X, que � o centro\n"
+#~ "da Interface Gr�fica do GNU/Linux (Linux GUI). Para isso, voc� deve\n"
+#~ "configurar sua placa de v�deo e monitor. A maioria desses passos\n"
+#~ "s�o autom�ticos, pode ser que o seu trabalho seja o de apenas\n"
+#~ "verificar o que foi feito e aceitar as configura��es :)\n"
+#~ "\n"
+#~ "\n"
+#~ "Quando a configura��o acabar, o X ser� reiniciado (a n�o ser que\n"
+#~ "pe�a ao Drakx para n�o faz�-lo) para voc� checar e ver se\n"
+#~ "a configura��o est�o corretas. Se ela n�o servir, voc� pode voltar\n"
+#~ "e mud�-las, quantas vezes for necess�rio."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Se algo estiver errado na configura��o do X, use essas op��es para "
+#~ "configurar\n"
+#~ "corretamento o Sistema de Janelas X."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Se voc� quiser usar o login gr�fico, selecione \"Sim\". Caso contr�rio,\n"
+#~ "escolha \"N�o\"."
+
+#~ 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 ""
+#~ "Voc� pode escolher o n�vel de seguran�a do seu sistema. Favor olhar o "
+#~ "manual para mais\n"
+#~ "  informa��es. Basicamente, se voc� n�o sabe qual escolher, mantenha a "
+#~ "op��o padr�o.\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 ""
+#~ "Seu sistema ser� reinicializado.\n"
+#~ "\n"
+#~ "Ap�s reiniciar, seu novo sistema Mandrake Linux se inicializar� "
+#~ "automatica-\n"
+#~ "mente. Se voc� quiser entrar em outro sistema operacional existente,\n"
+#~ "favor ler as instru��es adicionais."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "Tcheco (Programadores)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Eslov�qui (Programadores)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Nome do perfil a ser criado:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Gravar /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Restaurar do arquivo"
+
+#~ msgid "Save in file"
+#~ msgstr "Salvar no arquivo"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Restaurar do disquete"
+
+#~ msgid "Format all"
+#~ msgstr "Formatar tudo"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Ap�s formatar todas as parti��es,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "todos os dados nessas parti��es ser�o perdidos"
+
+#~ msgid "Reload"
+#~ msgstr "Atualizar"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "Voc� quer criar um disquete de instala��o automati��o para replica��o do "
+#~ "linux?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "Configura��o 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 ""
+#~ "Com um servidor CUPS remoto, voc� n�o tem que configurar\n"
+#~ "nenhuma impressora aqui; elas ser�o detectadas automaticamente\n"
+#~ "a n�o ser que voc� tenha um servidor em uma rede diferente;\n"
+#~ "nesse �ltimo caso, voc� tem que dar o endere�o IP do\n"
+#~ "servidor CUPS e opcionalmente o n�mero da porta."
+
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Fila remota"
+
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "Nome do dom�nio"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "Nenhuma impressora"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "restrito"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Monitoramento da Rede"
+
+#~ msgid "Profile "
+#~ msgstr "Perfil "
+
+#~ msgid "Statistics"
+#~ msgstr "Estat�sticas"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "Velocidade de envio: "
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "Velocidade de recebimento: "
+
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "Tipo de conex�o: "
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Conectando � Internet"
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Desconectando da Internet"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "N�o foi poss�vel desconectar."
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Desconectado da Internet"
+
+#~ msgid "Connection complete."
+#~ msgstr "Conex�o completada."
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "A conex�o falhou:\n"
+#~ "Verifique a sua configura��o no Centro de Controle Mandrake."
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "Configura��o"
+
+#~ msgid "sent: "
+#~ msgstr "enviados: "
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid "received: "
+#~ msgstr "recebidos: "
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ msgid "Connect"
+#~ msgstr "Conectar"
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ msgid "Disconnect"
+#~ msgstr "Desconectar"
+
+#~ msgid "/File/_New"
+#~ msgstr "/Arquivo/_Novo"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>A"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Arquivo/_Abrir"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>A"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Arquivo/_Salvar"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Arquivo/Salvar _Como"
+
+#~ msgid "/File/-"
+#~ msgstr "/Arquivo/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Op��es"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Op��es/Teste"
+
+#~ msgid "/_Help"
+#~ msgstr "/Aj_uda"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Ajuda/_Sobre"
+
+#, fuzzy
+#~ msgid "Default Runlevel"
+#~ msgstr "Default"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Fila remota"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "O conte�do do arquivo de configura��o n�o pode ser interpretado."
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Arquivo de configura��o irreconhec�vel"
+
+#~ msgid "Adapter"
+#~ msgstr "Adaptador"
+
+#, fuzzy
+#~ msgid "Disable network"
+#~ msgstr "Desativar"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "Ativar"
+
+#~ 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 ""
+#~ "Voc� agora pode testar seu mouse. Use os bot�es e a roda para\n"
+#~ "verificar se as configura��es est�o boas. Se n�o estiverem, voc� pode "
+#~ "clicar\n"
+#~ "em \"Cancelar\" e escolher outro driver."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "Conex�o DSL (ou ADSL)"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Fechar"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr ""
+#~ "Voc� pode diretamente especificar o URI para acessar a impressora com CUPS"
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Sim, imprimir p�gina de teste ASCII"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Sim, imprimir p�gina de teste PostScript"
+
+#~ msgid "Paper Size"
+#~ msgstr "Tamanho do Papel"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Ejetar p�gina ap�s a impress�o?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Op��es do driver Uniprint"
+
+#~ msgid "Color depth options"
+#~ msgstr "Op��es do n�mero de cores"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Imprimir texto como PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Corrigir texto stair-stepping?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "N�mero de p�ginas conforme p�ginas de sa�da"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Margem Direita/Esquerda em pontos (1/72 de polegada)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Margem Superior/Inferior em pontos (1/72 de polegada)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Op��es extras de GhostScript"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Op��es extras de Texto"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Inverter a ordem das p�ginas"
+
+#~ msgid "CUPS starting"
+#~ msgstr "Iniciando CUPS"
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Selecionar cone��o da impressora remote"
+
+#~ 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 precisa de um nome (por exemplo\n"
+#~ "lp). Outros par�metros, tal como a descri��o da impressora ou sua\n"
+#~ "localiza��o pode ser definida. Qual nome deve ser usado para essa\n"
+#~ "impressora e como a impressora est� conectada?"
+
+#~ 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 fila de impress�o (a qual as impress�es s�o direcionadas) precisa\n"
+#~ "de um nome (normalmente lp) e de um diret�rio spoll associado a ela.\n"
+#~ "Qual o nome e diret�rio deve ser utilizado para esta fila e como a "
+#~ "impressora est� conectada?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Nome da fila de impress�o"
+
+#~ msgid "Spool directory"
+#~ msgstr "Diret�rio spool"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Para ter um sistema mais segura, voc� deve escolher \"Usar arquivo shadow"
+#~ "\"\n"
+#~ "e \"Usar senhas MD5\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Se sua rede usa NIS, selecione \"Usar NIS\". Se voc� n�o sabe, pergunte\n"
+#~ "ao seu administrador de rede."
+
+#~ msgid "yellow pages"
+#~ msgstr "p�ginas amarela"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "Configura��o LAN"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minutos"
+#~ msgid "Provider dns 1"
+#~ msgstr "DNS 1 do provedor"
 
-#~ msgid "1 minute"
-#~ msgstr "1 minuto"
+#~ msgid "Provider dns 2"
+#~ msgstr "DNS 2 do provedor"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d segundos"
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Como voc� quer se conectar � Internet?"
diff --git a/perl-install/share/po/ru.po b/perl-install/share/po/ru.po
index e5958ed96..20378308f 100644
--- a/perl-install/share/po/ru.po
+++ b/perl-install/share/po/ru.po
@@ -5,7 +5,7 @@
 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: 2000-11-23 10:07 +0200\n"
 "Last-Translator: Vladimir Choundalov <choundalovvv@point.pwp.ru>\n"
 "Language-Team: ru\n"
@@ -13,24 +13,24 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\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 "������������ ���������� Xinerama"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "����������������� ������ ����� \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "��������� ��� ���������� �������"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -38,33 +38,33 @@ 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 ������"
 
-#: ../../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 "����� ������������ 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"
@@ -75,17 +75,18 @@ msgstr ""
 "���� ���������� �������������� �������� 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 "���� ���������� ����� ������������ ���������� 3D ��������� � 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 ""
 "�������� �������� - ��� ����������������� ��������� � �������� ��������� "
 "������ ����������."
 
-#: ../../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"
@@ -114,27 +115,31 @@ msgstr ""
 "���� ���������� �������������� �������� XFree %s, �������, ��������, ����� "
 "������������ 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 "�������� ������ ������ ����� ����������"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "�������� ����� ��� �������"
 
-#: ../../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"
@@ -157,41 +162,41 @@ 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,152 +204,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: %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 "����� �������"
 
-#: ../../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: %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 "������� ����� �������"
 
-#: ../../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"
@@ -357,20 +366,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?"
@@ -423,214 +432,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 ��� ������"
 
-#: ../../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 ��� 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 "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 "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 "Monitor ��������� ������������ 1600x1200 ��� 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor ��������� ������������ 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 "LILO � ��������� ����"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "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/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 "������� ��������� ���������� ����������"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "����� ������������� ���������� ����������"
 
-#: ../../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 "������� ������ ������ RAM (������� %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "��������� ��������� ��������"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "������� ������ RAM � 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 "��������� ���������"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "�������� �������� Firmware"
 
-#: ../../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 "�������� �������� � CD?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "�������� �������� OF?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 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."
@@ -638,145 +658,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
+#: ../../any.pm_.c:217
 msgid "Modify"
 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 "�����"
 
-#: ../../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 "������-������"
 
-#: ../../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
+#: ../../any.pm_.c:278
 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 "������� �����"
 
-#: ../../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
-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 "(������ %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"
@@ -794,20 +813,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"
@@ -818,11 +837,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"
@@ -831,35 +850,35 @@ 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 ""
 "��� ������������ ������ ��������� ����� ������ � ������ ��������, \n"
 "����� , `-' � `_'"
 
-#: ../../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"
@@ -868,50 +887,63 @@ 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 "��������"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "�����������"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "����-����"
 
-#: ../../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"
 "���� �� �� ������ ������������ ���� ������������, ������� �� ������ ��������."
 
-#: ../../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 "���"
+
 #. -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 "����� ���������� � 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 "����������� ������� %c � %c ��� ��������� ������."
 
 #. -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 ��� �������� ��������� ��, 'e' ��� ��������������"
 
 #. -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 "������ ����� ���������, ��� 'c' ��� ������ ��������� ������."
 
 #. -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 "��������� ����� ����� �������� ������������� ����� %d ������."
 
-#: ../../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 "������� ���� �� �������.\n"
@@ -985,522 +1022,701 @@ msgstr "��������� ���� ��������"
 msgid "/_File"
 msgstr "/_����"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/����/_�����"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/����/_�������"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/����/_���������"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/����/��������� _���"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/����/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/����/_�����"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_���������"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/���������/��������"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_������"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/������/_� ���������..."
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "���������"
-
-#: ../../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 ""
-"� ������ ������ �� ����������� %s � �������� ��������� ��������.\n"
-"�������� ����� ��������� ��� ������� ������� ���������."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "����� Lilo/grub"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "������� ��������� NewStyle"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "NewStyle �������"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "������������ �������"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "������������ Gtk+ �������"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "��������� Aurora ��� ��������"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "����� Lilo/grub"
+
+#: ../../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 ""
+"� ������ ������ �� ����������� %s � �������� ��������� ��������.\n"
+"�������� ����� ��������� ��� ������� ������� ���������."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "���������"
+
+#: ../../bootlook.pm_.c:108
 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 "��������� X-Window ��� ������ ������"
 
-#: ../../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 ""
 "��, � ���� ������������ �������������� ���� � ������� � ����� (user, desktop)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "��������� �����"
-
-#: ../../bootlook.pm_.c:228
-msgid "Default Runlevel"
-msgstr "RunLevel �� ���������"
-
-#: ../../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 "������"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "���������� ������� ��� ������ /etc/inittab : $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "���������� ������� ��� ������ /etc/sysconfig/autologin : $!"
+#: ../../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"
+"(������ ������������ MicroSoft Dos/Windows).\n"
+"��������� ������ ����� �������� ������ �������\n"
+"(�������� �� ����, � ����� �� \"�������� ������\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "������������ ���������� ����� ��� ����-����������"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "���������� ������� �� ������"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "�����"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "���������� ������� �� ������"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "�������� ������� ��������"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "���������� ������� �� ������"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "���"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+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:423
+msgid "Use ``Unmount'' first"
+msgstr "������� �������� ``�������������''"
 
-#: ../../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\n"
-"(������ ������������ MicroSoft 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 "������ �hunk %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_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.pm_.c:274
+#: ../../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 ""
-"\n"
-"���� �����������, ��� ���� ������\n"
-"�������� �������� ��������, ��������,\n"
-"��� �� ������� ��� �������.\n"
+"����� �������� ������ ��������, ������� ����, ����� �������� ����������� "
+"������� ���������� ������"
+
+#: ../../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.pm_.c:277
+#: ../../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"
-"���� ����������� Bootstrap\n"
-"������ ������������\n"
-"��� ����������� �������� ���� ��.������.\n"
+"��������� ������� �������� ����� ����� ������ ������\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 "�� ���� %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.pm_.c:435
+#: ../../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 ""
+
+#: ../../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 ""
+"�� ���� �������� ����� ������������, ��������� ���� ������ ������������ ��� "
+"loop back. ������� ������� loopback"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "���������� ������ �������� ������� FAT"
+
+#: ../../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_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 "���� ��� ������������ ������ loopback, �������� ������ ����."
+
+#: ../../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 "����� ��� ��������� �� �������?"
+
+#: ../../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 +1727,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"
@@ -1524,7 +1740,7 @@ msgstr ""
 "���� ����� �������������� ��������� �������� 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"
@@ -1534,281 +1750,241 @@ 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
+#: ../../diskdrake_interactive.pm_.c:864
 #, 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
-#, 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 ""
-"�� ���� �������� ����� ������������, ��������� ���� ������ ������������ ��� "
-"loop back. ������� ������� 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"
+#: ../../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 "���� ��� ������������ ������ loopback, �������� ������ ����."
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "������ �hunk %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"
+"��� ����������� �������� ���� ��.������.\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 "��� LVM?"
+#: ../../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 "�� ���� %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:231
+#: ../../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 ""
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "������ ������������: "
 
-#: ../../fs.pm_.c:243
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "������ �������������� %s: %s"
@@ -1821,41 +1997,44 @@ msgstr "�������"
 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 "�� �� ������ ������������ ���������� ��� LVM ��� ����� ������������ %s"
 
-#: ../../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 ""
 "��� ���� ����� ������������ ����� �������� �������� ������� (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"
@@ -1863,340 +2042,411 @@ msgstr ""
 "��������� ������: �� ������� ���������� ��� �������� ����� �������� ������. "
 "��������� ������������ ��� ��������� ��������� �������."
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "� ��� �� ������� ������� ��������!"
 
-#: ../../help.pm_.c:9
-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"
+#: ../../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 ""
+"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 ""
-"��� ���������� ������� ������� �������� ��� ����������� ���������.\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"
-"������� \"�������\" ���� �� �������� � ��������� ��������.\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"
-"������������."
-
-#: ../../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\"."
+"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"
-"\n"
+"���� ����������� ������������ ������� Linux, ������������ ��\n"
+"����� ������� �����. �� ������ �������� ���������, ��������� ��������, "
+"������ ��� �������� \n"
+". ���� �� �� ��������, �� ������ ��� �������� ������ �������� (root)\n"
+"������ (\"/\"). �� ������� ��� ������� ���������, ����� �� �� ������� "
+"���������� ��� ������ ��������� \n"
+". ���� �� ������ ������� ���� ������ �� ��������� ������� ��� �����,\n"
+"����������� ������� \"/home\" (��� �������� ���� � ��� ������, ����� � ��� "
+"����\n"
+"����� ������ ������� Linux).\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
 "\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"
 "\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"
+"\"����� �������\" (��������, \"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"
+"\"��� �������� �����\" - \"hd\" ���� � ��� ������� ���� � IDE ����������� � "
+"\"sd\"\n"
+"���� ��� 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 ""
-"����������, �������� \"���������\", ���� � ��� �� ���� ����������� "
-"���������� ������ Linux-Mandrake\n"
-"��� �� ������ ������������ ��������� ������������ ������.\n"
+"\"����� �������� �����\" ��� ������ ����� ����� \"hd\" or \"sd\". ��� "
+"������� ������ IDE:\n"
 "\n"
+"   * \"a\" �������� \"master ���� �� ������ IDE �����������\",\n"
 "\n"
-"����������, �������� \"����������\", ���� �� ������ �������� ��� "
-"������������� ������  Linux-Mandrake.\n"
+"   * \"b\" �������� \"slave ���� �� ������ IDE �����������\",\n"
 "\n"
+"   * \"c\" �������� \"master ���� �� ������ IDE �����������\",\n"
 "\n"
-"� ����������� �� ������ ����� � GNU/Linux, �� ������ ������� ���� �� "
-"��������� ������� ��������� ��� ���������� �����\n"
-"������������� ������� Linux-Mandrake:\n"
+"   * \"d\" �������� \"slave ���� �� ������ IDE �����������\".\n"
 "\n"
-"\t* �������������: ���� �� ����� ������� �� ������������� ������������ "
-"������ GNU/Linux �������� ����. ��������� �����\n"
-"\t  ����� ������� � ��� ����� ������ ����� ��������� ��������.\n"
 "\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"
-"\t* ����������: ���� �� ���������� ������� � GNU/Linux, �� ������ ������� "
-"������� ���������� (������� �������, ������,\n"
-"\t  ���������� ��������) ����� �������. ��� ����� ������ ������ ��������, "
-"��� � �������� ��������� \"�������������\" \n"
-"\t  �������, ������� ��� ����� �����, ��� �������� 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* �������: ���� �� ��������� �������� �������� � GNU/Linux, �� ������ "
-"������� ���� ������� ���������. ��� � � ������ \"����������\",\n"
-"\t  �� ������� ������� ������� ���������� (������� �������, ������, "
-"���������� ��������). ������ �����\n"
-"\t  ��������� � ������ ����� ������ ���������. � ��� �� ������ ����������� "
-"����� ������ ��������� �������� ���������.\n"
-"\t  �������� �� ��������� �������, �� ������� �������� �������� � GNU/Linux, "
-"����� ���� ����� ������.  ������� �� ��������� ���� ������� ���������,\n"
-"\t ���� �� �� ������� � ���, ��� �������."
-
-#: ../../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 ""
-"��������:\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"
-"  - ����������: ���� �� ������� � GNU/Linux, �� ������ ������� ������� \n"
-"���������� ����� �������. ������ ������� ����. \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"
-"  - �������: ���������������, ��� � ��� ���� ���� � GNU/Linux  � �� ������ \n"
-"    ��������� ������ ��������� ���������. ��� � ��� ������ \"����������\" \n"
-"    �� ������� ������� ������� ���������� ����� �������.\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 ""
 
-#: ../../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"
-"\n"
-"\t* ������� �������: ��� ��������� ����� � ��� ������, ���� �� ���������� "
-"������������ ������� � �������� ��� ������� ������ � �����\n"
-"\t  ��� ����.\n"
-"\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"
-"\t* ���������� ��������t: ��� ������� �����, ���� �� ���������� ������������ "
-"���� ������� � �������� ��� ���������� ��������. � ��� �����\n"
-"\t  ������ ����� ������������� �������� ��� ����������, �������, "
-"�������������� �������� ������� � ����� ��� �������� ������� ��������.\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"
+"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* ������: ������� �����, ���� �� ���������� ������������ ��������� � "
-"�������� �������. ���� � �������� ����-������� (NFS ���\n"
-"\t  SMB), ������� ������ (��� Unix ��� ��� Microsoft Windows), ������� "
-"�������������� (NIS), ������� ��� ������\n"
-"\t  � ��� �����. ������� �� ��������, ��� ����� ����������� ������ ���� 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"
-"\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"
+"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 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 ��������� ���������� PCI SCSI �������(�). ���� DrakX\n"
-"������ ���������� SCSI ������� � � ���� ����� �������������� �������, �� �� "
-"����� ������������� \n"
-"����������.\n"
+"������ �� ������ ������� �������, ������� ����� ����������� ��� ��������.\n"
 "\n"
 "\n"
-"���� DrakX �� ������ �� ������ SCSI ��������, ISA SCSI �������� ��� PCI SCSI "
-"��������, \n"
-"����� ��� ����� ����� ������ � ������� SCSI �������� � ����� \n"
-"�������. ���� ��������� ���, �� ������ ������ \"���\". ���� �� �������\n"
-"\"��\", �� ��� ����� ��������� ������ ���������, �� ������� �� ������� "
-"������� ������ ���.\n"
+"����� �� �������� ���� �� �����, ����� �������� ��������� ��������� \n"
+"� ��������� ������� ����� �������.\n"
 "\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 (�� ��������) � ��������� ��� � �������\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"
-"���� �� ������� ������� ��� �������, DrakX ������� ���, ������ �� �� \n"
-"������� ��� ���� ���������. �� ������ ��������� DrakX ���������� ��������� "
-"����� \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"
+"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"
-"���� ���, ��� ������� ������� ��������� ��������. ����������, ����������� "
-"�����������\n"
-"������������ (����� 3, ������ \"Collective informations on your hardware) "
-"for hints\n"
-"��� ������� ��� ���������� � �������� ������������ � ������������\n"
-"�� web ����� ������������� (���� � ��� ���� ������ � ��������) ��� "
-"���������� ��������� � Microsoft Windows\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 ""
 "� ���� ������ ��� ����� ������� ����� �� ����� ������� �����\n"
-"� ������� �� ������ ������������� Linux-Mandrake. ���� �� ���� ���\n"
+"� ������� �� ������ ������������� Mandrake Linux. ���� �� ���� ���\n"
 "������������ ������������ ������� �������� ��� ��������� �����, ��� "
 "�����������\n"
 "������� ���� �� �������. �� ���� ��������� �� ������� ����������� � "
 "����������\n"
-"���������� ��������� ������������ � �������� ����� ��� ��������� Linux-"
-"Mandrake.\n"
+"���������� ��������� ������������ � �������� ����� ��� ��������� Mandrake "
+"Linux.\n"
 "\n"
 "\n"
 "��������� ����� ��������� ������ ������ ��������� �������� ���������,\n"
@@ -2223,128 +2473,242 @@ msgstr ""
 "������������ ������ �������� \n"
 "�����, �������� ��������� �������:\n"
 "\n"
-"\t* ������������ ������������ ���������: ������ ��������� ���� ��� ��������� "
+"* ������������ ������������ ���������: ������ ��������� ���� ��� ��������� "
 "������������ �������� Linux �� ����� ������� �����. ��������\n"
-"\t  ���� �����, ���� �� ������ �� ������������. \n"
+"  ���� �����, ���� �� ������ �� ������������. \n"
 "\n"
 "\n"
-"\t* �������� ���� ����: �������� ���� �����, ���� �� ������ ������� ��� "
+"* �������� ���� ����: �������� ���� �����, ���� �� ������ ������� ��� "
 "���������� � ��� �������, ������������ �� ����� ������� ����� � �������� "
 "�� \n"
-"\t  ����� ����� Linux-Mandrake ��������. ������ ��������� �������� ����� "
+"  ����� ����� Mandrake Linux ��������. ������ ��������� �������� ����� "
 "������� - ������������ ������ ����� ������������� ���������� ���� ��������\n"
-"\t  �� ��� �� �������.\n"
+"  �� ��� �� �������.\n"
 "\n"
 "\n"
-"\t* ������������ ��������� ����� � ������� Windows: ���� � ��� ����������� "
+"* ������������ ��������� ����� � ������� Windows: ���� � ��� ����������� "
 "Microsoft Windows � �������� ��� ����� �� ������� �����, �� ��� ��������\n"
-"\t  ������� ��������� ������������ ��� Linux. ����� ��� �������, �� ������ "
+"  ������� ��������� ������������ ��� Linux. ����� ��� �������, �� ������ "
 "������� ���\n"
-"\t  ������ Microsoft Windows � ��� ������ (�������� ������ \"�������� ���� "
-"����\" ��� \"����� �������\" ) ��� �������� ������\n"
-"\t  ������ ������� Microsoft Windows. ��� ��������� ����� ���� ��������� ��� "
+"  ������ Microsoft Windows � ��� ������ (�������� ������ \"�������� ���� ����"
+"\" ��� \"����� �������\" ) ��� �������� ������\n"
+"  ������ ������� Microsoft Windows. ��� ��������� ����� ���� ��������� ��� "
 "������ ������. ��� ������� �������������\n"
-"\t  ���� �������� ������������ � Linux-Mandrake � Microsoft Windows �� ����� "
-"� ��� �� ����������.\n"
+"  ���� �������� ������������ � Mandrake Linux � Microsoft Windows �� ����� � "
+"��� �� ����������.\n"
 "\n"
 "\n"
-"\t  ����� ������� ����� ��������, ��� ����� ������, ��� ������ ������� "
+"  ����� ������� ����� ��������, ��� ����� ������, ��� ������ ������� "
 "Microsoft\n"
-"\t  Windows ����� ������, ��� ������������. ��� ��������, ��� � ��� ����� "
+"  Windows ����� ������, ��� ������������. ��� ��������, ��� � ��� ����� "
 "������ ����� ��� \n"
-"\t  Microsoft Windows ��� �������� ���������� � ��������� ����� ��������.\n"
+"  Microsoft Windows ��� �������� ���������� � ��������� ����� ��������.\n"
 "\n"
 "\n"
-"\t* ����� �������: �������� ���� �������, ���� �� ������ ������� ������� ��� "
+"* ����� �������: �������� ���� �������, ���� �� ������ ������� ������� ��� "
 "������� ����. ������ ���������\n"
-"\t  . ���� ������� ����� ������, �� ����� �������. �� ������ ����� �������� "
+"  . ���� ������� ����� ������, �� ����� �������. �� ������ ����� �������� "
 "��� ���� ������. �������\n"
-"\t  �� ��������� ���� �������, ���� �� �� ������� � ���, ��� �������."
+"  �� ��������� ���� �������, ���� �� �� ������� � ���, ��� �������."
 
-#: ../../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 ""
+"����� ������������ ��� �������� �������, ������� ���� ������ ����������, "
+"��� \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"
+"������������ �� ��� ����������. ���� �� ������ ��� �������, �������� ����� "
+"�������,\n"
+"������� �� ������ ���������������.\n"
+"\n"
+"\n"
+"������ �����, ��� ������������� ����������������� ��� ����� ������������ "
+"�������.\n"
+"�� ������ ����������������� �������, ���������� ������������ ������� (����� "
+"��� \"/\",\n"
+"\"/usr\" ��� \"/var\"), �� ��� ������������� �� ������� ��� ��������, "
+"����������  ����������,\n"
+"������� �� ������ ��������� (������ ��� ������ /home).\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"
+"������� ��� ����������� ��������������.\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"
+"������� �� \"OK\" ��� �������������� ��������.\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\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"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\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"
+" * \"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"
-"������������ ��� ��������� ����� ����� Linux-Mandrake �������. ���� �������\n"
+"������������ ��� ��������� ����� ����� Mandrake Linux �������. ���� �������\n"
 "��� ������� (�� ����� ���������� ��������� GNU/Linux ��� ������\n"
 "���������� ���������), �� ������ ������������ ������������ �������. �� ���� "
 "������ �������,\n"
@@ -2423,171 +2787,42 @@ msgstr ""
 "�������� 50MB, �� ������ ������������ ��� ����� ��� \n"
 "�������� ���� � ������ ramdisk ��� ������� ��������� ��������."
 
-#: ../../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"
-"\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\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\" 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 ""
-"���� ����������� ������������ ������� Linux, ������������ ��\n"
-"����� ������� �����. �� ������ �������� ���������, ��������� ��������, "
-"������ ��� �������� \n"
-". ���� �� �� ��������, �� ������ ��� �������� ������ �������� (root)\n"
-"������ (\"/\"). �� ������� ��� ������� ���������, ����� �� �� ������� "
-"���������� ��� ������ ��������� \n"
-". ���� �� ������ ������� ���� ������ �� ��������� ������� ��� �����,\n"
-"����������� ������� \"/home\" (��� �������� ���� � ��� ������, ����� � ��� "
-"����\n"
-"����� ������ ������� Linux).\n"
-"\n"
-"\n"
-"��� ������� - ������ ������ ����������� ��������� �������: \"���\", \"�������"
-"\".\n"
-"\n"
-"\n"
-"\"���\" ����������� ��������� �������: \"��� �������� �����\", \"����� "
-"�������� �����\",\n"
-"\"����� �������\" (��������, \"hda1\").\n"
-"\n"
-"\n"
-"\"��� �������� �����\" - \"hd\" ���� � ��� ������� ���� � IDE ����������� � "
-"\"sd\"\n"
-"���� ��� SCSI ����.\n"
-"\n"
-"\n"
-"\"����� �������� �����\" ��� ������ ����� ����� \"hd\" or \"sd\". ��� "
-"������� ������ IDE:\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"
-"�������, ������������ �� ���� ������� �����. ������ ���������, ����� ������� "
-"�� \"OK\", ��\n"
-"�� ������� ������������ ������� ���������� � �������, ������������ �� ���� "
-"������� �����,\n"
-"������� ��� ���������� Windows.\n"
-"\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\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"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\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"
+" * \"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"
-"\"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 ""
 "�� ����� ������� ����� ���������� ����� ������ ������� Microsoft Windows\n"
 ". �������� ������, ������ �������� �� ������ �������� ��� ���������\n"
-"����� ����� ������������ ������� Linux-Mandrake.\n"
+"����� ����� ������������ ������� Mandrake Linux.\n"
 "\n"
 "\n"
 "��� ������� - ������ ������ ����������� ��������� �������: \"��� Linux\", "
@@ -2624,946 +2859,506 @@ msgstr ""
 "���� \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"
-"\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"
+"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 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"
+"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 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"
+" * 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"
-"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"
-"\n"
+"����������, �������� \"���������\", ���� � ��� �� ���� ����������� "
+"���������� ������ Mandrake Linux\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"
+"  �������� �� ��������� �������, �� ������� �������� �������� � GNU/Linux, "
+"����� ���� ����� ������.  ������� �� ��������� ���� ������� ���������,\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"
-"\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"
-"���������� ��� ��������.\n"
-"\n"
-"\n"
-"����� DrakX ��������, ���������� �� � ��� ����� ��� �� ���������. ���� ���,\n"
-"����� ������ ��������������. ���� �� ��� ����� ������ ����������, ��������� "
-"����� ���������\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"
+"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 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."
+"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"
-"�������� ����� ���������� ������ �������, ��������� �� ����."
 
-#: ../../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 ""
-"���� � ��� ���� ��� CD �� ������������ ���� ������, ������� Ok.\n"
-"���� � ��� ��� �� ������ �� ���, ������� ��������.\n"
-"���� ����������� ������ ��������� CD, �������� �� ����� � ������� 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"
-"\n"
-"\n"
-"Please be patient."
-msgstr ""
-"� ������ ������ �������������� ��������� ����� ����� ������������ ������� "
-"Linux-Mandrake\n"
-". ��� �������� ������ ��������� ����� (����� ������� �� ���������� ������� "
-"���������\n"
-"� �������� ������ ����������).\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"
-"����������, ���������."
-
-#: ../../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 ""
-"������ �� ������ ��������� ���� ����. ����������� ������ � �������� ��� "
-"��������\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 ""
 "�������� ���������� ����. ��������, COM1\n"
 "���� � MS 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"
-"���� �� ������ ��������� ���� ����� ���������, ���� ���� �� ���\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 ""
-"�� ������ ������ �� ����������. ����������, �������� ���������������� ����, "
-"� �������� �� ���������.\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\n"
-"Windows) � 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 ""
-"������ �� ������ ��������� ��������� �������. ���� �� �� ������\n"
-"��� �� ������� � ���, ��� ����� ������, ���������� ���������� ����� ���� "
-"�������� ��\n"
-"������ ��������-����������. ���� �� �� ������� ���������� � DNS (������ "
-"����)\n"
-"������, �� ��� ���������� ����� �������� �� ������ ��������-���������� �� "
-"�����\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 ""
-"���� � ��� ������� �����, �������� ��� ������, ����� 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"
-"���������� � 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"
-"�� �� ������ ��� �� �������, ��� ����� ������, ���������� ���������� ����� "
-"����\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"
-"     �� �� ������ ������� IP �����, ���� �������� ������� \"�������������� IP"
-"\" �����.\n"
-"\n"
-"   * ����� ����: \"255.255.255.0\" - ������ ������� �����. ���� �� �� ������ "
-"��� �� �������, ��� ����� ������,\n"
-"     �������� �������������� ����� ����.\n"
-"\n"
-"   * �������������� IP: ���� � ����� ���� ������������ ��������� BOOTP ��� "
-"DHCP, �������� ���� �������. ���� �� ������, ��������, ��������� �\n"
-"    \"IP �����\" ����� ���������������. ���� �� �� ������ ��� �� ������� � "
-"������������� ������ ����� ��������, �������� �������������� ����� ����."
-
-#: ../../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."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"������ ����� ������ ��������� ������� (dialup). ���� �� �� ������, ��� "
-"������, \n"
-"���������� ���������� ����� �������� � ������ ���������� �������� (ISP)."
 
-#: ../../help.pm_.c:455
+#: ../../help.pm_.c:600
 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, ��������� �� ������. ���� �� "
-"������,\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"
+"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"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"�� ������ ���������� ����� ����������, ���� ���� ���������� c �������� ���\n"
-"��������� ���������. ������� �������� ������, ������ �� ������ ������� "
-"������ � \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"
-"������ �����, ��� ��� ����� �������� ������ � ������ ���������� � "
-"������������ � �����������������,\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 (�� ��������\n"
-") � ��������� ��� � ������� ����� � ������������ � ���������\n"
-"������� ������.\n"
-"\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
-"���� �� ����������� Microsoft Windows �� ���� ����������, choose \"���\"."
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\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"
-"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"
+" * \"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"
+"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"
-"�������� �� �������� ��������� ������ �������. �������,\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)."
+"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"
-" (��������� �� ���� Unix, Netware ��� Microsoft Windows)."
 
-#: ../../help.pm_.c:496
+#: ../../help.pm_.c:647
+#, fuzzy
 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"
+"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 don't have printer, click on \"None\"."
+"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 ""
-"���� �� ������ ��������� ������, �������� ������ ������ - \n"
-"CUPS ��� LPR.\n"
-"\n"
-"\n"
-"CUPS - �����, ������ � ������ ������� ������ ��� Unix ������ (CUPS\n"
-"�������� \"������� ������� ������ Unix\"). ��� ������� ������������ �\n"
-"Linux-Mandrake �� ���������.\n"
-"\n"
-"\n"
-"LPR - ������ ������� ������, ���������������� � ���������� ������������� "
-"Linux-Mandrake .\n"
+"LILO (LInux LOader - ��������� Linux) � Grub �������� ������������ "
+"��������:\n"
+"��� �������� ��������� GNU/Linux ��� ����� ������ ��, ������������� �� "
+"������.\n"
+"������ ��� ������ ������������ ������� ��������� ������������ � "
+"���������������.\n"
+"���� ����� �� ���������, �� ������ �������� ����� ������� �� ���� ������.\n"
+"������ ����������� ��� ������� ����������.\n"
 "\n"
 "\n"
-"���� � ��� ��� ��������, �������� \"�����������\"."
+"�������� �����, ��� �� �� ������ ������ ������ ������ � ���� ��, � ����� "
+"������\n"
+"����� ������� ��������������� ������. �� � ���� ������ ��� �� �������� "
+"�����������\n"
+"����������� �������!"
 
-#: ../../help.pm_.c:511
+#: ../../help.pm_.c:658
+#, 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"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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\"."
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
 msgstr ""
-"� GNU/Linux ����� �������������� ����� ����� ���������. ������ ��� �������\n"
-"������ ���������.\n"
-"\n"
-"\n"
-"���� ��� ������� ��������� ��������� � ������ ����������, �������� "
-"\"���������\n"
-"�������\".\n"
-"\n"
-"\n"
-"���� �� ������ �������� ������ � �������� �� ��������� Unix ������, "
-"��������\n"
-"\"��������� �������\".\n"
+"���� �������, ���� �� ������\n"
+"��������� ����������, ����������� ��� �������� GNU/Linux.\n"
 "\n"
 "\n"
-"���� �� ������ ������������ �������, ������������ � ��������� ������ � "
-"Microsoft Windows \n"
-"(��� ������ � Unix, ��������� SMB ��������), �������� \"SMB/Windows 95/98/NT"
-"\"."
+"���� �� �� ��������� ��������� ����� ��, ��� �� �������, ���������\n"
+"\"������ ������ �� ����� (MBR)\"."
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:665
 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"
+"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"
-"   * 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 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 "
-"���� ��� ����������.\n"
+"DrakX ��������� ���������� PCI SCSI �������(�). ���� DrakX\n"
+"������ ���������� SCSI ������� � � ���� ����� �������������� �������, �� �� "
+"����� ������������� \n"
+"����������.\n"
 "\n"
-"������ ��� ����������� ������ ��������� ����������.\n"
 "\n"
+"���� DrakX �� ������ �� ������ SCSI ��������, ISA SCSI �������� ��� PCI SCSI "
+"��������, \n"
+"����� ��� ����� ����� ������ � ������� SCSI �������� � ����� \n"
+"�������. ���� ��������� ���, �� ������ ������ \"���\". ���� �� �������\n"
+"\"��\", �� ��� ����� ��������� ������ ���������, �� ������� �� ������� "
+"������� ������ ���.\n"
 "\n"
-"   * ��� ��������: �������� ������ (spooler) \"lp\" ��� ��� �������� �� "
-"���������. �������, � ��� ������ ���� ������� � ������ \"lp\".\n"
-"     ���� � ��� ������ ���� �������, �� ������ ������������ ��������� ���� "
-"��� ����. �� ������ ������ ��������� �� ��������\n"
-"     \"|\". �������, ���� �� ������������� ��������� ���, ��� ����� "
-"��������� ������, ��������: \"��� �������|lp\".\n"
-"     �������, ���������� \"lp\" � ����� ����� ��� ������, ����� ��������� �� "
-"���������.\n"
 "\n"
 "\n"
-"   * ��������: ��� ��������� �������������, �� ����� ��������� �������� ���� "
-"��������� �������� ���������� � ������ ���������� ��� ���� �� ����������\n"
-"     ������ ����������� ������������ ��� �������.\n"
+"���� �� ������� ������� ��� �������, DrakX ������� ���, ������ �� �� \n"
+"������� ��� ���� ���������. �� ������ ��������� DrakX ���������� ��������� "
+"����� \n"
+"����������. ������ ��� �������� ������.\n"
 "\n"
 "\n"
-"   * ������������: ���� �� ������ ������� �����-���� ���������� � "
-"������������\n"
-"     ������ ��������, �������� �� ����� (������ ������ ���, ��� ������\n"
-"     , �������� \"2�� ����\").\n"
+"���� ���, ��� ������� ������� ��������� ��������. ����������, ����������� "
+"�����������\n"
+"������������ (����� 3, ������ \"Collective informations on your hardware\") "
+"for hints\n"
+"��� ������� ��� ���������� � �������� ������������ � ������������\n"
+"�� web ����� ������������� (���� � ��� ���� ������ � ��������) ��� "
+"���������� ��������� � Microsoft Windows\n"
+"(���� �� ���������� �� ����� �������)."
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:720
+#, fuzzy
 msgid ""
-"You need to enter some informations here.\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"
-"   * 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"
+"For Linux, there are a few possible options:\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"
-"    \"|\". ���, ���� �� ������������� ����� ����������� ���, �� ��������� "
-"��� ������, ��������: \"��� �������|lp\".\n"
-"    �������, ���������� � ����� ���� ������ \"lp\" ����� ��������� �� "
-"���������.\n"
-"\n"
-"  \n"
-"   * ������� �������: � ���� �������� ����� ��������� ��� ������� �� ������. "
-"�������� ����� �� ���������,\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"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\n"
-"   * ��� �����������: ���� ��� ������� ��������� ����������� � ������ "
-"����������, �������� \"��������� �������\".\n"
-"     ���� �� ������ ������������ �������, ������������ � ��������� Unix "
-"������, �������� \"��������� lpd �������\".\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"
-"     ���� �� ������ ������������ �������, ������������ � ��������� Microsoft "
-"Windows ������ (��� � ������ Unix ���������� SMB\n"
-"     ��������), �������� \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     ���� �� ������ ������������ �������, ������������� � ��������� ���� "
-"NetWare, �������� \"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"
+"         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"
-"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"
+" * 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"
-"��� ������� - ����������� ��������� ������������ � ������� ������������� "
-"�����. � GNU/Linux\n"
-"�� ���������� \"/dev/lp0\", � Microsoft Windows - \"LPT1\" ."
-
-#: ../../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"
+" * 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"
-"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."
+" * 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 ""
-"���������� �������� ���������� ���������, �������������� ������ ��������.\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"
+"�� ������ �������� �������������� ������ ��� yaboot, ���� ��� ������ "
+"������������ ������,\n"
+"���� ��� ������ ����, ���� ��� ���������� ������������ ������.\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"
 "\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 ��� ����� Linux-Mandrake "
-"�������.\n"
-"������ ����� ������ ������, ����� ���������, ��� ��� ������ ��������� .\n"
+"��� Linux, �������� ��������� ����������: \n"
 "\n"
 "\n"
-"������������ root - ��� ��������� ������������� � ������������ ������������, "
-"�������\n"
-"��������� �������� ������������ �������. �������������, ����������� "
-"��������� ������. \n"
-"������������� ������� ������ root ������������ ������ ����� ���� "
-"������������ ��� �����������\n"
-"�������, �� ������ � ������ ������, ����������� � ���.\n"
+"  - �����: ��� ������ ���, ������� ����� ���������� � ����������� yaboot ��� "
+"������ ����� \n"
+"�������� ��������.\n"
 "\n"
 "\n"
-"������ ������ �������� �� ���� � ���� � ���� ��� ������� 8\n"
-"�������� �������. ��� ������� � ������ ������ ����������.\n"
+"  - �����: ��� ����� ��� ������������ ����.  ������ ��� vmlinux ��� \n"
+"������� vmlinux ���� ����������.\n"
 "\n"
 "\n"
-"�� ����� ������ ��� ������� ������� ��� �������: �� ������ ���������� ��� "
-"���\n"
-"������ ������."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"����� �������� ������������ �������, ���� ������� \"������������ ������� ����"
-"\" \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"
+"  - Root: �������� ���������� ��� '/' ��� ��������� Linux.\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"
+"  - ���������: � ������������ Apple, ���������� ���� ����� ������������ "
+"�����\n"
+"���������� ������ ����� ����������, ���� ��� �������� �� ���������� ������ "
+"���� ��� ���\n"
+"2�� � 3�� ������ ���������� �� ������� Apple �����. ��� ��������� \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"
-"� ���� \"�������� �������\", � ������� �������� ��� \n"
-"���������.\n"
 "\n"
+"\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
-"������ ����� �������� ������� ������ ��� ����! ���� ���� �� ������ "
-"������������\n"
-"������������� �� ������, �� ������� ������� ��� ������ root\n"
-"��� ������������ ������: ��� ������� ������� ������ ������������. \n"
-"����� ��������� ������� ������� ���������.\n"
+"\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
 "\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."
-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"
+"  - Initrd: ���� �������� ����� �������������� ���� ��� �������� "
+"�������������� ������� �� ����, ��� ����������� \n"
+"���������� ������ ���������, ���� ��� �������� ������ ramdisk ��� �������� � "
+"��������� ��������.\n"
 "\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"���� �������, ���� �� ������\n"
-"��������� ����������, ����������� ��� �������� GNU/Linux.\n"
+"  - ������ Initrd: �� ��������� ������ ramdisk ������ 4096 ����. ���� ��� "
+"�����������\n"
+"���������� ������� ramdisk, �� ����� ������������ ���� ��������.\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 ""
-"���� �� ������ ����� ������ �������, �� ������� ������� �������� \"/dev/hda"
-"\"\n"
-"(IDE ������ ���� �� ������ ������) ��� \"/dev/sda\" (������ 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"
+"  - ������-������: ������ '��������' ('root') ������ ������������� "
+"������������ � ������ ������-������, ����� ���������\n"
+"�������� �������� ������� ����� ��������� ������� � '�������' ���������. � "
+"���� ��������� �� ������ ��� ��������.\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 ""
-"LILO (LInux LOader - ��������� Linux) � Grub �������� ������������ "
-"��������:\n"
-"��� �������� ��������� GNU/Linux ��� ����� ������ ��, ������������� �� "
-"������.\n"
-"������ ��� ������ ������������ ������� ��������� ������������ � "
-"���������������.\n"
-"���� ����� �� ���������, �� ������ �������� ����� ������� �� ���� ������.\n"
-"������ ����������� ��� ������� ����������.\n"
+"  - NoVideo: ���� ������ ����� ���������� Apple ����� ��������� "
+"������������, �� �� ������\n"
+"������� ���� �������� ��� �������� � ������ 'novideo', � ���������� ������� "
+"framebuffer .\n"
 "\n"
 "\n"
-"�������� �����, ��� �� �� ������ ������ ������ ������ � ���� ��, � ����� "
-"������\n"
-"����� ������� ��������������� ������. �� � ���� ������ ��� �� �������� "
-"�����������\n"
-"����������� �������!"
+"  - �� ���������: �������� ���� ������� ��� ����� Linux, ������������� �� "
+"���������. ��� ����������� �������\n"
+"�������� ENTER �� ����������� yaboot. ���� ������� ����� ����� ������� "
+"�������� '*', ���� �� �������\n"
+"TAB ��� ���������� ��������� ��������."
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:765
+#, 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"
+"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"
-"    * <number>:  use the corresponding text mode.\n"
+"Yaboot's main options are:\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 � grub:\n"
-"  - ����������� ����������: ����������� ��� ���������� (��������, ������ "
-"�������� �����,\n"
-"������� �������� ����������� ������. ���� �� �� ������� ��������� ������ "
-"�����, ��\n"
-"��������� \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - �������� ����� ��������� ������ �� ���������: ������ ����� � �������\n"
-"����� ������� � ������� ������� ��������� ��������� ���� ����� ��������� "
-"������� ������.\n"
-"��� ������� ��� ������, ����� ����������� � �������� ����� ����� �����\n"
-"��������� ����������. ��������� �� ����, ���� \"��������\" \n"
-"�� �����������, ��� ����� ����."
-
-#: ../../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"
-"\n"
-"Yaboot 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 ""
 "Yaboot - ��������� ��������� ��� ������������ NewWorld MacIntosh. �� ����� \n"
 "��������� ���� GNU/Linux, ���� MacOS ��� MacOSX, ���� ��� ���� �� ����� "
@@ -3615,346 +3410,80 @@ msgstr ""
 "��������� ����� ��������� ������� �������� \n"
 "Firmware."
 
-#: ../../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"
-"\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 ""
-"�� ������ �������� �������������� ������ ��� yaboot, ���� ��� ������ "
-"������������ ������,\n"
-"���� ��� ������ ����, ���� ��� ���������� ������������ ������.\n"
-"\n"
-"\n"
-"��� ������ �� - ������ �������� ������ ����� � �������� ������.\n"
-"\n"
-"\n"
-"��� Linux, �������� ��������� ����������: \n"
-"\n"
-"\n"
-"  - �����: ��� ������ ���, ������� ����� ���������� � ����������� yaboot ��� "
-"������ ����� \n"
-"�������� ��������.\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"
-"  - �����: ��� ����� ��� ������������ ����.  ������ ��� vmlinux ��� \n"
-"������� vmlinux ���� ����������.\n"
-"\n"
-"\n"
-"  - Root: �������� ���������� ��� '/' ��� ��������� Linux.\n"
-"\n"
-"\n"
-"  \n"
-"  - ���������: � ������������ Apple, ���������� ���� ����� ������������ "
-"�����\n"
-"���������� ������ ����� ����������, ���� ��� �������� �� ���������� ������ "
-"���� ��� ���\n"
-"2�� � 3�� ������ ���������� �� ������� Apple �����. ��� ��������� \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: ���� �������� ����� �������������� ���� ��� �������� "
-"�������������� ������� �� ����, ��� ����������� \n"
-"���������� ������ ���������, ���� ��� �������� ������ ramdisk ��� �������� � "
-"��������� ��������.\n"
-"\n"
-"\n"
-"  - ������ Initrd: �� ��������� ������ ramdisk ������ 4096 ����. ���� ��� "
-"�����������\n"
-"���������� ������� ramdisk, �� ����� ������������ ���� ��������.\n"
-"\n"
-"\n"
-"  - ������-������: ������ '��������' ('root') ������ ������������� "
-"������������ � ������ ������-������, ����� ���������\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"
-"  - NoVideo: ���� ������ ����� ���������� Apple ����� ��������� "
-"������������, �� �� ������\n"
-"������� ���� �������� ��� �������� � ������ 'novideo', � ���������� ������� "
-"framebuffer .\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"
-"  - �� ���������: �������� ���� ������� ��� ����� Linux, ������������� �� "
-"���������. ��� ����������� �������\n"
-"�������� ENTER �� ����������� yaboot. ���� ������� ����� ����� ������� "
-"�������� '*', ���� �� �������\n"
-"TAB ��� ���������� ��������� ��������."
-
-#: ../../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"
+" * \"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"
-"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 ""
-"SILO - ��� ��������� �������� ��� SPARC: \n"
-"�� �������� ��������� GNU/Linux ��� ����� ������ ��, ������������� �� "
-"������.\n"
-"������ ��� ������ ������������ ������� ��������� ������������ � "
-"���������������.\n"
-"���� ����� �� ���������, �� ������ �������� ����� ������� �� ���� ������.\n"
-"������ ����������� ��� ������� ����������.\n"
-"\n"
-"\n"
-"�������� �����, ��� �� �� ������ ������ ������ ������ � ���� ��, � ����� "
-"������ ����� ������� ��������������� ������. �� � ���� ������ ��� �� "
-"�������� ����������� ����������� �������!"
 
-#: ../../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 ""
-"�������� ��������� SILO:\n"
-"  - ��������� ����������: �������, ��� �� ������ ���������� ����������,\n"
-"����������� ��� �������� GNU/Linux. ���� �� ������ �����, ��� �������,\n"
-"��������� \"������ ������ ���������� (MBR)\".\n"
-"\n"
-"\n"
-"  - �������� ����� ��������� ������ �� ���������: ������ ����� � �������\n"
-"����� ������� � ������� ������� ��������� ���� ����� ��������� ������� "
-"������.\n"
-"��� ������� ��� ������, ����������� � �������� ����� ����� �����\n"
-"��������� ����������. ��������� �� ����, ���� \"��������\" \n"
-"�� ������� ��� ����� ����."
+"�������� ������� ����, ������� �� ������ �������� ��� ���������\n"
+"������ ������� Mandrake Linux. ������ ���������, ��� ������ ����� �������� "
+"��� �����������\n"
+"��������������."
 
-#: ../../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"
-"\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"
-"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 ""
-"������ ����� ��������� X Window System, ������� ��������\n"
-"������� GNU/Linux GUI (����������� ���������������� ���������). ��� ����\n"
-"���� ���� ��������� ���������� � �������. ������� ����� ���� �����\n"
-"����������������, ��� ��� ���� ������ ����� �������� � ��������\n"
-"����������� ��������� � ������������� ��������� ��������� :)\n"
+"������� �� \"OK\" ���� �� ������ ������� ��� ������ �\n"
+"�������, ������������ �� ���� ������� �����. ������ ���������, ����� ������� "
+"�� \"OK\", ��\n"
+"�� ������� ������������ ������� ���������� � �������, ������������ �� ���� "
+"������� �����,\n"
+"������� ��� ���������� Windows.\n"
 "\n"
 "\n"
-"����� ���������������� ����������, ����� ������� X (���� �� ��\n"
-"��������� DrakX �� ������ �����) ����� �� ����� ���������, ����������\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, ����������� ��� ��������� ���\n"
-"���������� ��������� X Window System."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"���� �� ������������� ����������� ���� (login), �������� \"��\". ����� - \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"
-msgstr ""
-"�� ������ ������� ������� ������������ ��� ����� �������. ��������� "
-"���������� �����\n"
-"  ����� � �����������. ��� ������, ���� �� �� ������, ��� �������, �������� "
-"��������� �� ���������.\n"
+"������� �� \"������\" ��� ������ ���� �������� ��� ������ ������ � "
+"�������� \n"
+"�� ���� ������� �����."
 
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"������� ���������� ���������������.\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
-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 "��������� ����"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-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:403
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3980,20 +3509,20 @@ msgstr ""
 "\n"
 "�� �������, ��� ������ ���������� ��� �������?\n"
 
-#: ../../install_any.pm_.c:434
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "���������� ������������ broadcast ��� NIS ������"
 
-#: ../../install_any.pm_.c:675
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "�������� ����������������� ��� FAT ������� � �������� %s"
 
-#: ../../install_any.pm_.c:679
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "��� ������� �� ��������������� ��� FAT"
 
-#: ../../install_any.pm_.c:689
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -4001,30 +3530,20 @@ msgstr ""
 "����� ������������ ����������� ����� �������, ��������� ��������� � "
 "����������, �������� ``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:711
-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 ""
@@ -4035,7 +3554,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"
@@ -4045,11 +3564,11 @@ msgstr ""
 "��� ����� �������� ������ (��� ������� ��� ������������).\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"
@@ -4059,55 +3578,60 @@ 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 "� ��� ������ ���� ������ 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 "������������ ������������ ������"
 
-#: ../../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"
@@ -4116,12 +3640,12 @@ 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"
@@ -4140,21 +3664,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)"
@@ -4162,33 +3686,33 @@ 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
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 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"
@@ -4197,28 +3721,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 "������������� ����"
 
@@ -4230,12 +3754,12 @@ msgstr ""
 "��������� ������, �� � �� ����, ��� �� ��������� ����������.\n"
 "����������� �� ���� ����� � ����."
 
-#: ../../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"
@@ -4247,16 +3771,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"
@@ -4270,32 +3794,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 "���� ���������"
 
@@ -4303,7 +3827,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 "���������� ����� "
 
@@ -4312,21 +3836,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 "��������� ������ ��������� �������:"
 
@@ -4334,29 +3858,33 @@ msgstr "��������� ������ ��������� �������:"
 msgid "Use existing configuration for X11?"
 msgstr "������������ ������������ ��������� ��� 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 ""
 "�� ����� ������� ���� ��������. ����� ���������� ��������� ��� ���������\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"
@@ -4371,7 +3899,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"
@@ -4388,84 +3916,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?"
@@ -4473,24 +3985,43 @@ 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
+#, fuzzy
+msgid "Load/Save on floppy"
+msgstr "��������� �� �������"
+
+#: ../../install_steps_gtk.pm_.c:461
+#, fuzzy
+msgid "Updating package selection"
+msgstr "��������� ����� �������"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "����� �� �������� ���������"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "�����"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 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"
@@ -4550,15 +4081,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 "�������"
 
-#: ../../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"
@@ -4573,7 +4104,7 @@ msgstr ""
 "���� � ��� ��� ���, ������� �������� (Cancel), ����� �������� ��������� � "
 "����� �����."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "��� ��������� ������� ��������� ������:"
 
@@ -4581,34 +4112,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"
@@ -4662,7 +4180,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"
@@ -4699,7 +4217,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"
@@ -4720,12 +4238,12 @@ msgid ""
 msgstr ""
 "��������\n"
 "\n"
-"������������ ������� � ��������� ����������, ��������� � ������������ Linux-"
-"Mandrake \n"
+"������������ ������� � ��������� ����������, ��������� � ������������ "
+"Mandrake Linux \n"
 "����� ����� ���������� \"����������� ��������\". ����������� �������� "
 "���������, �� �� �������������� \n"
 "����� ��������, �������, ������ � ������������, ����������� � ������������ \n"
-"������� � ��������� ����������� ������������ Linux-Mandrake.\n"
+"������� � ��������� ����������� ������������ Mandrake Linux.\n"
 "\n"
 "\n"
 "1. ����������� ����������\n"
@@ -4779,7 +4297,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"
@@ -4816,7 +4334,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"
@@ -4835,103 +4353,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 "����������"
 
-#: ../../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 "������ ������ ��������� ���������"
 
-#: ../../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 "�������� ������ ����"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "������� 2 ������"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 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"
@@ -4948,7 +4462,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!"
@@ -4956,50 +4470,61 @@ 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 ""
+
+#: ../../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 "����� ������ �������� �������� (/) � ����� �������?"
 
-#: ../../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 "��������� ������ �����?"
 
-#: ../../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)"
@@ -5007,30 +4532,60 @@ 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
+#: ../../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"
@@ -5040,12 +4595,12 @@ msgstr ""
 "���� � ��� ��� �� ������ �� ���, ������� ��������.\n"
 "���� ����������� ������ ��������� CD, �������� �� ����� � ������� 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"
@@ -5054,11 +4609,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"
@@ -5130,93 +4695,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 "����� ������� ��� ��������� �������"
 
-#: ../../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?"
+#: ../../install_steps_interactive.pm_.c:813
+#, fuzzy
+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 ""
+
+#: ../../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
 msgid "No printer"
 msgstr "��� ��������"
 
-#: ../../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
 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
 msgid "ISDN card"
 msgstr "���������� ����� ISDN"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "�������� �����"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "TV �����"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "����� ������� ������ �� ������ ������������?"
+#: ../../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 "���� ������ ������� ����� (��� ����� ������ ���� �� ����� %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 "������ ��������"
+#: ../../install_steps_interactive.pm_.c:949
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "��������������"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:951
+#, fuzzy
+msgid "LDAP Server"
+msgstr "NIS ������"
+
+#: ../../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 �����"
 
-#: ../../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 "
@@ -5244,19 +4856,19 @@ msgstr ""
 "������ \n"
 "�������� � ������� \"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 "������ ��������"
 
-#: ../../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 "
@@ -5278,32 +4890,40 @@ 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 ""
+
+#: ../../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?"
@@ -5311,16 +4931,22 @@ msgstr ""
 "������ ��������� aboot, \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 "��������� bootloader �� ������. ��������� ��������� ������:"
 
-#: ../../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 ""
@@ -5333,38 +4959,34 @@ msgstr ""
 " ����� �������: shut-down\n"
 "��� ��������� �������� �� ������� ����������� ���������� ����������."
 
-#: ../../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 ""
-"������ ������������� ����-����������������� ������� ��� ������������ 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"
@@ -5374,30 +4996,30 @@ 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"
 "������ ����������� ���� � ������� enter ��� ������������.\n"
-"�� ����������� �� ������������ ������� ������� Linux-Mandrake,\n"
-"����������� �� http://www.linux-mandrake.com/.\n"
+"�� ����������� �� ������������ ������� ������� Mandrake Linux,\n"
+"����������� �� http://www.mandrakelinux.com/.\n"
 "���������� � ��������� ����� ������� ���� � �����-������������\n"
-"����� ������ ����������� ������������ �� ������������ Linux-Mandrake."
+"����� ������ ����������� ������������ �� ������������ Mandrake Linux."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 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"
@@ -5411,42 +5033,59 @@ msgstr ""
 "\n"
 "��������, �� ����������� ��������� ���������.\n"
 
-#: ../../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
 msgid "Replay"
 msgstr "���������"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 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
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "���������� kdesy"
 
-#: ../../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 "���������, ����������"
 
+#: ../../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"
@@ -5472,267 +5111,291 @@ 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
+#, fuzzy
+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 "����������� (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "�e���������"
 
-#: ../../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
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 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 "��������� \"����� ����\" 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
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "������� (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "��������"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "������� (Yawerty)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "������� (Yawerty)"
+
+#: ../../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 "������� ����������"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "������� ����������"
+
+#: ../../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 "����������� \"�������� ���\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+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 "������� ������� ���������� ����\n"
 
@@ -5844,170 +5507,221 @@ msgstr "�������"
 msgid "No mouse"
 msgstr "��� ����"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../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 ""
+
+#: ../../my_gtk.pm_.c:415
 msgid "Finish"
 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 "<- ����������"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "��� �����?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "��������� ��������"
+#: ../../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 "use 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"
-" ���� ��� ��� � ������, �������� �����������"
+"�� ����� ������� �� ���������� �������� �������� 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 ""
+"������� ��� ����� ������ (host), ���� ������ ���.\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"
 
-#: ../../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 ������� ����������"
+#: ../../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 ������� ����������"
+#: ../../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 "���� (��� ������������)"
+#: ../../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"
+" ���� ��� ��� � ������, �������� �����������"
 
-#: ../../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-������ (���������� �����)"
 
-#: ../../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"
@@ -6019,19 +5733,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."
@@ -6039,109 +5753,59 @@ msgstr ""
 "���������� ����� ISDN PCI, �� �� ��� �� ������� ����������. �������� �� "
 "��������� ������ ����� 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 �� ����������. �������� �� �� ��������� ������."
 
-#: ../../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 "��������, � ������ ����������������� ����� ��������� �����."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "��������� �������"
 
-#: ../../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 "�� ���� �������"
 
-#: ../../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
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "������ ������ DNS (�������������)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../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}. �� ��������?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6149,7 +5813,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."
@@ -6157,11 +5821,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."
@@ -6169,102 +5833,53 @@ 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 "�������������� � ��������"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "������������� �� ��������"
 
-#: ../../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 "���������� �������� � ���������"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "������ ��������� ����"
-
-#: ../../netconnect.pm_.c:812
-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 "����� � ��� ��� ISDN ����������?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "�������������� � ��������"
-
-#: ../../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 - ��������� 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 "use pptp"
-
-#: ../../netconnect.pm_.c:846
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "��������� ������������� ������� ���������� %s. �� ��������?"
-
-#: ../../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 ""
-"������ ���������� ��������� dhcp �� ������ ������������?\n"
-"�� ��������� - dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "��������� ����"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "�� ������ ������������� ����"
+"\n"
+"�� ������ ������������� ��� ������������� ���� ����������."
 
-#: ../../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 ""
-"�������� �������� ��� ����������� ����: \n"
 "\n"
-"%s"
+"�� ������ ������������� ��� ������������� ���� ����������."
+
+#: ../../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:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6275,7 +5890,7 @@ msgstr ""
 "������� Ok ����� �������� ������� ���������, ��� ��������, ����� "
 "������������� ���� ��������� � �������� � ��������� �����.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6287,72 +5902,114 @@ msgstr ""
 "������ �� �������� ���� ���������� � �������� �/��� ��������� �����.\n"
 "���� �� �� ������ ������������ ���������������, �������� �������.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "�������� ������� ��� ���������"
 
-#: ../../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
 #, c-format
 msgid "detected on port %s"
 msgstr "������ �� ����� %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 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 "������� %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (��� ADSL) ����������"
+#: ../../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
 #, c-format
 msgid "detected on interface %s"
 msgstr "��������� �� ���������� %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 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
 msgid "LAN connection"
 msgstr "���������� �� ��������� ����"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "���������� ���� ��� ��������� ������� ���� ethernet"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "��� �� ������ �������������� � ��������?"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+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 ""
+
+#: ../../network/netconnect.pm_.c:215
+#, fuzzy
+msgid "Internet connection"
+msgstr "���������� ��������-����������"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "������ �� ��, ����� ���� ���������� ����������� ��� ��������?"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "��������� ����"
+
+#: ../../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 ""
+"�������� �������� ��� ����������� ����: \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 ""
 "�����������, ��������� ���� � ���������� � �������� ���������.\n"
 "\n"
-"������ ����� ������� ��������� � ����� �������."
+"������ ����� ������� ��������� � ����� �������.\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."
@@ -6360,31 +6017,7 @@ msgstr ""
 "����� ����� �� ����������� ������������� ��� X ������, \n"
 "����� �������� ������� ��-�� ����� ����� ����������."
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "������� ���� �� �������"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "��������� ����"
-
-#: ../../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 ""
-"������� ��� ����� ������ (host), ���� ������ ���.\n"
-"��������� �������� DHCP ��� ������ ���������� ��� ������.\n"
-"��� ����� ������ ������ ���� ������ ���������,\n"
-"�������� ``mybox.mylab.myco.com''."
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "��� ������"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6396,7 +6029,7 @@ msgstr ""
 "������ �������� ��� ���������� �����������.\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"
@@ -6406,38 +6039,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 "(driver $module)"
+#: ../../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"
@@ -6449,43 +6082,150 @@ 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 "��������� 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 ������ ���� 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 "��������� ��������"
+
+#: ../../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 "IP ����� ������� DNS ������� ���������� (�������������)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "IP ����� ������� DNS ������� ���������� (�������������)"
+
+#: ../../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
+#, fuzzy
+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 "���� (��� ������������)"
+
+#: ../../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 "
@@ -6495,26 +6235,21 @@ msgstr ""
 "������������ ����� ������� � ���, ����� ����������� ��������� ������� ���, "
 "����� ���� ��� ����� �� ����������� (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 "������ ���� � ��������� ������"
 
-#: ../../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"
@@ -6544,49 +6279,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 "������� ������� (�����)"
 
-#: ../../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 "����� ���������� ������"
 
-#: ../../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
+#, 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
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP ����� ������ ���� � ������� 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+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 "��������� ���� ��������"
+
+#: ../../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"
@@ -6594,37 +6493,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 ""
 "��� ������������� ��������� ������� ������ ��� ����� ������� ��� ���������� "
 "������� ������ � ��� ������� ������ �� ���� �������, � ������� ��������� "
 "������ ����� �������� ������� �� ������."
 
-#: ../../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
+#, fuzzy
+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"
@@ -6637,29 +6559,37 @@ msgstr ""
 "�������, ��������� � ��������� ���������, ��� ������������, ������ � "
 "���������� � ������� ������."
 
-#: ../../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 ""
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr ""
+
+#: ../../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."
@@ -6668,57 +6598,225 @@ msgstr ""
 "NetWare (�� ������ ��������� � ������ � ���� TCP/IP) � ��� �������, "
 "��������������� ���������� ��������, � ����� ��� ������������ � ������."
 
-#: ../../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 ""
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "����� �������� Socket"
 
-#: ../../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 ""
 
-#: ../../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
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "��� ������ � ���������"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "����� ���������� ������"
+
+#: ../../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 "��� ��������"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "�� ������ �������� ������� ����� ��� ������������� �������� � CUPS."
+#: ../../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
+#, fuzzy
+msgid "Printer model selection"
+msgstr "����������� ��������"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "����� � ��� ��� ��������?"
 
-#: ../../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 "��������� ��������"
+
+#: ../../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 "��������� ��������"
+
+#: ../../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 "������ ��������� ������� ������?"
 
-#: ../../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 "��, ���������� ��� ������� �������� ������"
+
+#: ../../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 ""
 "������� �������� ���������� ������ ������.\n"
 "������ ��� ������� ���������� ����� ������ ��������� �����.\n"
@@ -6727,239 +6825,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 ""
 "������� �������� ���������� ������ ������.\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 "��, ���������� ������� �������� ������ PostScript"
+#: ../../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
+#, 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 "��������� ��������"
 
-#: ../../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 "��� �������� ������ ��������� ������ �����, ����� � �������������"
 
-#: ../../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 ""
-"������� ��������� ������� ������.\n"
-"�� ������ �������� ����� ��� �������� ������������."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "����������� CUPS"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "��� ��������"
 
-#: ../../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 "������ ���� ��������� 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 \n"
-"�, ��������, ����� �����."
 
-#: ../../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:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "��������������"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "������� �������"
+#: ../../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"
-msgstr "��� �������� ������ ��������� ������ �����, ����� � �������������"
+"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 "����� ������� ������ �� ������ ������������?"
 
-#: ../../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 ""
-"������� �������� ��������� ��� (��������, lp).\n"
-"�������������� ���������, ����� ��� �������� �������� � ��� ���������������\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
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "����� ���� ����������� ��������"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+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
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "������ ���� ��������� CUPS..."
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+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 ""
-"������ ������� ������, � ������� ���������� ������� ��� ������, ������� "
-"�������� ����� (������ lp) � ���������� � ��� �������� ������� ������. "
-"������� ��� � ������� ������� ������, � ����� ������, ������� ���������� "
-"�������?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "��� �������"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+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 "��� ��������"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "������ �������������� ���������?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "��������� ��������"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "������� spool"
+#: ../../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 "���������� ��������-����������"
 
-#: ../../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 "�� ������ ������������� ����"
+
+#: ../../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 ������ ���� http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+#, fuzzy
+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 ������ ���� 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 "����-����"
+
+#: ../../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 "������ �� ���������"
+
+#: ../../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 ""
 "��������� ALSA (����������� �������� ����������� Linux) �������� �������"
 
-#: ../../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."
@@ -6969,7 +7432,7 @@ msgstr ""
 "����� ����� ���� ����������� ��� ���������� ������ ��� ������� ������� "
 "�������."
 
-#: ../../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."
@@ -6979,7 +7442,7 @@ msgstr ""
 "������� at, � ��������� ������ ������, ����� ������� �������� ���������� "
 "�����."
 
-#: ../../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 "
@@ -6992,7 +7455,7 @@ msgstr ""
 "cron �� \n"
 "UNIX, ������� ������ ������������ � ����� ������ ��������� ���������."
 
-#: ../../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 "
@@ -7005,7 +7468,7 @@ msgstr ""
 "� ����������� ���� � \n"
 "�������."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
@@ -7013,7 +7476,7 @@ 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."
@@ -7021,7 +7484,7 @@ msgstr ""
 "Apache �������� �������� World Wide Web. �� ������������ ��� ������������ "
 "������ 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 "
@@ -7035,7 +7498,7 @@ msgstr ""
 "��������, ������� telnet, ftp, rsh, � rlogin. ���������� inetd �������� \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."
@@ -7043,7 +7506,7 @@ msgstr ""
 "��������� ���������� ������� ��� 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"
@@ -7054,7 +7517,7 @@ msgstr ""
 "kbdconfig.\n"
 "��� ����������� ����� ����� �������� ����������."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:40
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
@@ -7062,11 +7525,11 @@ 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."
@@ -7074,7 +7537,7 @@ 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)."
@@ -7082,7 +7545,7 @@ msgstr ""
 "lpd �������� ������� ������, ����������� ��� ���������� ������ lpr. ���\n"
 "� ������ ������� ������, �������������� ������� �� ������ �� ���������."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
@@ -7091,7 +7554,7 @@ msgstr ""
 "��������\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."
@@ -7099,7 +7562,7 @@ msgstr ""
 "named (BIND) �������� �������� �������� ���� (DNS), ������� ������������ ��� "
 "�������������� ���� ����� � 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."
@@ -7107,7 +7570,7 @@ msgstr ""
 "��������� � ������������ ��� ������� �������� ������� (NFS), SMB (Lan\n"
 "Manager/Windows) � NCP (NetWare)."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -7115,7 +7578,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"
@@ -7126,7 +7589,7 @@ msgstr ""
 "���� ������ ������������ ���������������� ������� NFS, �������������� �\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."
@@ -7135,7 +7598,7 @@ msgstr ""
 "TCP/IP.\n"
 "���� ������ ������������� �������� ������������ ������ NFS."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
@@ -7143,11 +7606,11 @@ msgstr ""
 "������������� �������� ������� numlock � ������� � \n"
 "XFree ��� ��������."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr "��������� OKI 4w � ����������� win-���������."
 
-#: ../../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 "
@@ -7159,7 +7622,7 @@ msgstr ""
 "���������, ����� ������� \n"
 "�� ��������� �� �������, ��� ��� �� �����, ���������."
 
-#: ../../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 "
@@ -7172,7 +7635,7 @@ msgstr ""
 "������� ������������� ��� ������� ��� ����������, ������� ��������� "
 "������������ �������� 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."
@@ -7180,7 +7643,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."
@@ -7188,7 +7651,7 @@ 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"
@@ -7196,7 +7659,7 @@ 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"
@@ -7207,7 +7670,7 @@ msgstr ""
 "�������� RIP. � �� ����� ��� RIP ������ ������������ � ��������� �����, ���\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."
@@ -7215,7 +7678,7 @@ msgstr ""
 "�������� rstat ��������� ������������� ���� ��������\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."
@@ -7223,7 +7686,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)."
@@ -7232,11 +7695,11 @@ msgstr ""
 "�������������,\n"
 "���������� �� ������ � ������������� ������� 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."
@@ -7245,31 +7708,69 @@ msgstr ""
 "��������� � ��������� ������� ��������� ���������. ������, ����� syslog "
 "������ �������."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr "��������� �������� ��� ����� USB ���������."
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 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 "��������, ����� ������� ������ ������������� ����������� ��� ��������"
 
+#: ../../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
 msgid "running"
 msgstr "����������"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 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."
@@ -7277,11 +7778,16 @@ msgstr ""
 "��� �������������� ����������\n"
 "�� ��� �������. ��������."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "��� ��������"
 
-#: ../../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"
@@ -7289,15 +7795,66 @@ msgstr ""
 "������� �������� �� ��������, ��� ������� ��������� :(\n"
 "���������� ����������, ������ ������ �������"
 
-#: ../../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 "�����������!"
+
+#: ../../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 "���������� ��������-����������"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "���������� ��������-���������� � ������ ������ ��������"
 
-#: ../../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"
@@ -7309,31 +7866,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
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "���������� ��������..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "���������� ���������� � �������� ������ ���������."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "���������� ��������-���������� � ������ ������ ���������"
 
-#: ../../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"
@@ -7345,27 +7902,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 "��������� ��������..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "���������� ���������� � �������� ������ ��������."
 
-#: ../../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
 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,27 +7924,31 @@ msgid ""
 "(LAN)."
 msgstr ""
 
-#: ../../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
 #, c-format
 msgid "Interface %s"
 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."
 msgstr ""
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "������� ���������"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7410,7 +7963,7 @@ msgstr ""
 "\n"
 "� ��������� ��������� ��������� ����, ��������� ���� �������."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -7418,21 +7971,22 @@ msgstr ""
 "����������, ��������, ����� ������� ������� ����� ��������� � ����� "
 "��������� ����."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr "��������, ������� ������� ��� ��������. � ��� ����������������."
 
-#: ../../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."
@@ -7440,23 +7994,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 "
@@ -7466,23 +8017,23 @@ msgstr ""
 "������ �� ������ ��������� ���� �������� ���������� � ������� ������������ � "
 "����� ��������� ����, ��������� �������������� ��������� ���� (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
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "��������� ���������� ���������� � �������� ������� �� �����������."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "��������� ���������� ���������� � ��������"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7497,83 +8048,82 @@ msgstr ""
 "\n"
 "������� �� ��������� ��� ������� ������� ���������."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "������������ ����  (%d ���������)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
 msgstr "�������: "
 
-#: ../../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:"
-msgstr "��� ������������ �������:"
+#: ../../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 "��� ����������:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "������ � ��������"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 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
 msgid "Connected"
 msgstr "���������"
 
-#: ../../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 "�� ���������"
 
-#: ../../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
 msgid "Starting your connection..."
 msgstr "������ ������ ����������..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "�������� ������ ����������..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7585,51 +8135,52 @@ msgstr ""
 "�������� /etc/sysconfig/network-scripts/net_cnx_down\n"
 "��� root."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "������ ������� �����������."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "��������� ������� � ��������..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "��������� ��������� ����"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "�������"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "�������"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "���������"
 
-#: ../../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
 msgid "Configure Local Area Network..."
 msgstr "��������� ��������� ����..."
 
-#: ../../standalone/draknet_.c:283
-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
 msgid "Please Wait... Applying the configuration"
 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'"
@@ -7637,36 +8188,38 @@ msgstr ""
 "� ��� ��� ����������� �����������.\n"
 "������� ����� �� ��������� ����� �� '���������'"
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "��������� ��������� ����"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "������� %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 "������ DHCP"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "���������"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "��������"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "��������"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+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'"
@@ -7674,35 +8227,27 @@ msgstr ""
 "� ��� ��� �� ������ ���������� � ��������.\n"
 "������� �������� ����������, ����� '���������'"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "��������� ���������� � ��������"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "��������� ���������� � ��������"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "��� ����������: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "���������"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "IP ����� ������� DNS ������� ���������� (�������������)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "IP ����� ������� DNS ������� ���������� (�������������)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "������� �����"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "������ DHCP"
 
@@ -7774,15 +8319,30 @@ msgstr ""
 "��������� �������.\n"
 "��������� ������������ ����������� �� ��������."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "��������� ������� ������������"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "�������� ����� ��� �������"
+
+#: ../../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:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "����� ����������"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "�������� ���������, ������� �� ������ ������������"
 
@@ -7811,82 +8371,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "���������� ������ ���������� !!!\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
-msgid "Test the mouse here."
-msgstr "��������� ���� ���� �����."
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "���������� ����"
-
-#: ../../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
-msgid "Close"
-msgstr "�������"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "����������� � �������� "
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "������������� �� �������� "
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "������ �������������� �� ��������."
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "������������ �� �������� ���������."
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "���������� ���������."
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"������ ���������.\n"
-"��������� ���� ��������� � ������ ���������� Mandrake."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "����������: "
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "��������: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "�������������"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "�������������"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "��������� ������� ������ ����� (firewall)"
@@ -7917,21 +8409,89 @@ msgstr ""
 "\n"
 "������� �� ��������� ��� �������� ������� ������ ����"
 
-#: ../../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 "����� ����������"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "������������"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "�����. �������� ������"
+
+#: ../../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 "��������� �������"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "�������� ������������"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "��������� ����"
+
+#: ../../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 ""
 "������ ��������� ������� ������ ����\n"
 "\n"
-"����� ������������� ������������ ������� ��� ���� Linux Mandrake ������.\n"
+"����� ������������� ������������ ������� ��� ���� Mandrake Linux ������.\n"
 "��� �������� ����������� ������ ������� ������ ����, �������� �������� ��\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"
@@ -7952,7 +8512,7 @@ msgstr ""
 "��������� �����\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"
@@ -7965,7 +8525,7 @@ msgstr ""
 "������, �� ������ �������� �������� ��� �� ���� ������.\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"
@@ -7978,7 +8538,7 @@ msgstr ""
 "�������� ���.\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 +8555,7 @@ msgstr ""
 "����������� telnet.\n"
 "������ � 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"
@@ -8007,7 +8567,7 @@ msgstr ""
 "������������ ����������� ������� ����� No � ������������ 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"
@@ -8022,7 +8582,7 @@ msgstr ""
 "�����������, ��������� 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"
@@ -8035,7 +8595,7 @@ msgstr ""
 "�� ������ ����� - ��. �����, �������� ��� �������� ������ ����.\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"
@@ -8048,7 +8608,7 @@ msgstr ""
 "��� ������.\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"
@@ -8060,7 +8620,7 @@ msgstr ""
 "(������������� �������������), ����� ����� ��� ���������. ��� ������ ���\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"
@@ -8076,7 +8636,7 @@ msgstr ""
 "���������� \n"
 "."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -8088,283 +8648,1531 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "������ �������� %s ��� ������: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "������� ��� ������ ����������, ������� ssh"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "����������"
+msgid "Network Computer (client)"
+msgstr "������� ��������� (������)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "������� �������"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS ������, SMB ������, Proxy ������, ssh ������"
 
 #: ../../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
-msgid "Network Computer (client)"
-msgstr "������� ��������� (������)"
+msgid "Firewall/Router"
+msgstr "������� ������ �����/�������������"
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "�������� ���������: ������� mp3 ��� MIDI, �������, � �.�."
+msgid "Domain Name and Network Information Server"
+msgstr "������ ���� (DNS) � ������ NIS"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "������� ��������"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"������� ���������: �������� ���������� (kword, abiword), ����������� ������� "
+"(kspread, gnumeric), ������������ pdf, � �.�."
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "����"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "�������� ���������: ������� mp3 ��� MIDI, �������, � �.�."
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "����������� �������"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "����� � HowTo � Linux � ��������� ����������� �����������"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"����� �������� ��� ������ � �������� ����� � �������� (pine, mutt, tin..) � "
-"��������� Web"
+msgid "KDE Workstation"
+msgstr "������� ������� KDE"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "���������� C � C++, ��������� � ����� include"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ������"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "������ ���� (DNS) � ������ NIS"
+msgid "Multimedia - Video"
+msgstr "����������� - �����"
 
 #: ../../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 "Database"
+msgstr "���� ������"
 
 #: ../../share/compssUsers:999
 msgid "PostgreSQL or MySQL database server"
 msgstr "������ ��� ������ PostgreSQL ��� MySQL"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS ������, SMB ������, Proxy ������, ssh ������"
+msgid "Tools to ease the configuration of your computer"
+msgstr "���������, ���������� ��������� ������ ����������"
+
+#: ../../share/compssUsers:999
+msgid "Multimedia - Sound"
+msgstr "����������� - ����"
+
+#: ../../share/compssUsers:999
+msgid "Utilities"
+msgstr "�������"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "������������"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ������"
+msgid "Console Tools"
+msgstr "��������� ��� �������"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "�������"
+msgid "Postfix mail server, Inn news server"
+msgstr "�������� ������ Postfix, ������ �������� Inn"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Internet station"
+msgstr "������� ��������"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "����������� �����"
+msgid "Multimedia station"
+msgstr "����������� �������"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "����������� - ����"
+#, fuzzy
+msgid "Configuration"
+msgstr "��������� ��������� ����"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "��������� ��� �����������: ���� � �.�."
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "��� ���������b� chtls (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "�����-������� � ���������"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"����� K Desktop, �������� ����������� ����� � ������� �������������� ��������"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "��������� ��� �������"
+msgid "Graphical Environment"
+msgstr "����������� �����"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "��������� ��� ������������/�������������� ����� � �����"
+msgid "Development"
+msgstr "����������"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "������� ������� �������"
+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 "��������� ��� �������� � ������ CD ������"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "����� � HowTo � Linux � ��������� ����������� �����������"
+msgid "Office Workstation"
+msgstr "������� ������� �������"
 
 #: ../../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, � �.�."
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "�������� ������ Postfix, ������ �������� Inn"
+msgid "Graphics programs such as The Gimp"
+msgstr "����������� ���������, ����� ��� The Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "����"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "����������� - �����"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "���������� C � C++, ��������� � ����� include"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
 msgstr "������� ������"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "����������� ���������, ����� ��� The Gimp"
+msgid "Mail/Groupware/News"
+msgstr "�����/��������� ��� ������ � ������/�������"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "������� ������� �������"
+msgid "Game station"
+msgstr "������� �������"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"����� K Desktop, �������� ����������� ����� � ������� �������������� ��������"
+msgid "Video players and editors"
+msgstr "�����-������� � ���������"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "��� ���������b� chtls (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "����������� - �������"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "��������� ��� �������� � ������ CD ������"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "��������� ��� �����������: ���� � �.�."
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "����������� - ������ CD"
+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
 msgid "Archiving, emulators, monitoring"
 msgstr "�������������, ��������, ������������"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "���� ������"
+msgid "Personal Finance"
+msgstr "������ �������"
 
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"������� ���������: �������� ���������� (kword, abiword), ����������� ������� "
-"(kspread, gnumeric), ������������ pdf, � �.�."
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Server"
-msgstr "������"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "����������� ����� � ������� ������������� �������� "
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "������ �������"
+msgid "Clients for different protocols including ssh"
+msgstr "������� ��� ������ ����������, ������� ssh"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "���������"
+msgid "Internet gateway"
+msgstr "���� ��������"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "������� ������� KDE"
+msgid "Sound and video playing/editing programs"
+msgstr "��������� ��� ������������/�������������� ����� � �����"
 
 #: ../../share/compssUsers:999
 msgid "Other Graphical Desktops"
 msgstr "������ ����������� �����"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
+msgid "Editors, shells, file tools, terminals"
+msgstr "���������, ��������, �������� �������, ���������"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "�����/��������� ��� ������ � ������/�������"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "��������� ��� ���������� ���������, ����� ��� gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "������� ������� Gnome"
+msgid "Games"
+msgstr "����"
 
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "���� ��������"
+msgid "Personal Information Management"
+msgstr "���������� ������ �����������"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "��������� ��� ������ Palm Pilot ��� Visor"
+msgid "Multimedia - CD Burning"
+msgstr "����������� - ������ CD"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "������� �������"
+msgid "Scientific Workstation"
+msgstr "������� ������� �������"
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, � �.�."
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "���������� ������� ��� ������ /etc/sysconfig/autologin : %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "�� ������ ������������� ����"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "�� ��������?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "��������� ������������� ������� ����������:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "��������� ������������� ������� ���������� %s. �� ��������?"
+
+#, 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 ""
+#~ "���� �� ������ ����� ������ �������, �� ������� ������� �������� \"/dev/"
+#~ "hda\"\n"
+#~ "(IDE ������ ���� �� ������ ������) ��� \"/dev/sda\" (������ SCSI ����)."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "������� ��������� ������� ������.\n"
+#~ "�� ������ �������� ����� ��� �������� ������������."
+
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "��� ����������: "
+
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "�������� ������������ �� ���������:"
+
+#~ msgid "Test the mouse here."
+#~ msgstr "��������� ���� ���� �����."
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ 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 ""
+#~ "�������� �� ������������ ������ ���������, ��������������� ����� "
+#~ "����������"
+
+#~ 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"
+#~ "  - ����������: ���� �� ������� � GNU/Linux, �� ������ ������� ������� \n"
+#~ "���������� ����� �������. ������ ������� ����. \n"
+#~ "\n"
+#~ "\n"
+#~ "  - �������: ���������������, ��� � ��� ���� ���� � GNU/Linux  � �� "
+#~ "������ \n"
+#~ "    ��������� ������ ��������� ���������. ��� � ��� ������ \"����������"
+#~ "\" \n"
+#~ "    �� ������� ������� ������� ���������� ����� �������.\n"
+#~ "    ��, ����������, ��������� ���� ������� ������ ���� �� ������ �������\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 ""
+#~ "������ �� ������ ���������� ������������� ����� �������. ��������:\n"
+#~ "\n"
+#~ "* ������� �������: ��� ��������� ����� � ��� ������, ���� �� ���������� "
+#~ "������������ ������� � �������� ��� ������� ������ � �����\n"
+#~ "  ��� ����.\n"
+#~ "\n"
+#~ "\n"
+#~ "* ���������� ��������t: ��� ������� �����, ���� �� ���������� "
+#~ "������������ ���� ������� � �������� ��� ���������� ��������. � ��� "
+#~ "�����\n"
+#~ "  ������ ����� ������������� �������� ��� ����������, �������, "
+#~ "�������������� �������� ������� � ����� ��� �������� ������� ��������.\n"
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "* ������: ������� �����, ���� �� ���������� ������������ ��������� � "
+#~ "�������� �������. ���� � �������� ����-������� (NFS ���\n"
+#~ "  SMB), ������� ������ (��� Unix ��� ��� Microsoft Windows), ������� "
+#~ "�������������� (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"
+#~ "\n"
+#~ "����� DrakX ��������, ���������� �� � ��� ����� ��� �� ���������. ���� "
+#~ "���,\n"
+#~ "����� ������ ��������������. ���� �� ��� ����� ������ ����������, "
+#~ "��������� ����� ���������\n"
+#~ "����� ����� ��������� �� ����������� ����� ������\n"
+#~ "�������. ����� ������ �� ������ ������� ������� \n"
+#~ "\"�������������� ����� �������\"; - � ���� ������ ��� �������� "
+#~ "����������� ������\n"
+#~ "�� ����� ��� 1000 �������..."
+
+#~ 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"
+#~ "�������� ����� ���������� ������ �������, ��������� �� ����."
+
+#~ 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 ""
+#~ "���� � ��� ���� ��� CD �� ������������ ���� ������, ������� Ok.\n"
+#~ "���� � ��� ��� �� ������ �� ���, ������� ��������.\n"
+#~ "���� ����������� ������ ��������� CD, �������� �� ����� � ������� 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 ""
+#~ "���� �� ������ ���������� ��� ��������� � ��������� ���\n"
+#~ "� ��������� ���� �������� ������ �������. ����������, �������� ���� "
+#~ "����������\n"
+#~ "����� �������, ����� DrakX ���� ��� ������������� ����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "���� � ��� ��� ���������� � �������� ��� � ��������� �����, ��������\n"
+#~ "\"��������� ����\".\n"
+#~ "\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\n"
+#~ "Windows) � Linux ���������� \"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 ""
+#~ "������ �� ������ ��������� ��������� �������. ���� �� �� ������\n"
+#~ "��� �� ������� � ���, ��� ����� ������, ���������� ���������� ����� ���� "
+#~ "�������� ��\n"
+#~ "������ ��������-����������. ���� �� �� ������� ���������� � DNS (������ "
+#~ "����)\n"
+#~ "������, �� ��� ���������� ����� �������� �� ������ ��������-���������� �� "
+#~ "�����\n"
+#~ "����������."
+
+#~ 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"
+#~ "���������� � DNS (������� ����), ��� ���������� ����� �������� �����\n"
+#~ "�� ������ ��������-���������� �� ����� ����������."
+
+#~ 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"
+#~ "�� �� ������ ��� �� �������, ��� ����� ������, ���������� ���������� "
+#~ "����� ����\n"
+#~ "�������� �� ������ ��������-����������."
+
+#~ 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 ""
+#~ "������ �� ������ ���������� ���� ���������� ����������� � ����.\n"
+#~ "\n"
+#~ "   * IP �����: ���� �� �� ������ ��� �� ������� � ���, ��� ����� ������, "
+#~ "�������� �������������� ����� ����.\n"
+#~ "     �� �� ������ ������� IP �����, ���� �������� ������� "
+#~ "\"�������������� IP\" �����.\n"
+#~ "\n"
+#~ "   * ����� ����: \"255.255.255.0\" - ������ ������� �����. ���� �� �� "
+#~ "������ ��� �� �������, ��� ����� ������,\n"
+#~ "     �������� �������������� ����� ����.\n"
+#~ "\n"
+#~ "   * �������������� IP: ���� � ����� ���� ������������ ��������� BOOTP "
+#~ "��� DHCP, �������� ���� �������. ���� �� ������, ��������, ��������� �\n"
+#~ "    \"IP �����\" ����� ���������������. ���� �� �� ������ ��� �� ������� "
+#~ "� ������������� ������ ����� ��������, �������� �������������� ����� ����."
+
+#~ 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 ""
+#~ "������ ����� ������ ��������� ������� (dialup). ���� �� �� ������, ��� "
+#~ "������, \n"
+#~ "���������� ���������� ����� �������� � ������ ���������� �������� (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 ""
+#~ "���� ������ ������������ ������� proxy, ��������� �� ������. ���� �� "
+#~ "������,\n"
+#~ "����� �� ���, ���������� � �������������� ���� ��� �������� ����������."
+
+#~ 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 ""
+#~ "�� ������ ���������� ����� ����������, ���� ���� ���������� c �������� "
+#~ "���\n"
+#~ "��������� ���������. ������� �������� ������, ������ �� ������ ������� "
+#~ "������ � \n"
+#~ "����� �������� ������, ������� ������ ����������.\n"
+#~ "\n"
+#~ "\n"
+#~ "������ �����, ��� ��� ����� �������� ������ � ������ ���������� � "
+#~ "������������ � �����������������,\n"
+#~ "����������� � ����� ������."
+
+#~ 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 ��� 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 ""
+#~ "���� �� ������ ��������� ������, �������� ������ ������ - \n"
+#~ "CUPS ��� LPR.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS - �����, ������ � ������ ������� ������ ��� Unix ������ (CUPS\n"
+#~ "�������� \"������� ������� ������ Unix\"). ��� ������� ������������ �\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 \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"
+#~ "   * 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"
+#~ "   * ��� ��������: �������� ������ (spooler) \"lp\" ��� ��� �������� �� "
+#~ "���������. �������, � ��� ������ ���� ������� � ������ \"lp\".\n"
+#~ "     ���� � ��� ������ ���� �������, �� ������ ������������ ��������� "
+#~ "���� ��� ����. �� ������ ������ ��������� �� ��������\n"
+#~ "     \"|\". �������, ���� �� ������������� ��������� ���, ��� ����� "
+#~ "��������� ������, ��������: \"��� �������|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"
+#~ "     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"
+#~ "    \"|\". ���, ���� �� ������������� ����� ����������� ���, �� ��������� "
+#~ "��� ������, ��������: \"��� �������|lp\".\n"
+#~ "    �������, ���������� � ����� ���� ������ \"lp\" ����� ��������� �� "
+#~ "���������.\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * ������� �������: � ���� �������� ����� ��������� ��� ������� �� "
+#~ "������. �������� ����� �� ���������,\n"
+#~ "     ���� �� �� ������, ����� ������� �������\n"
+#~ "\n"
+#~ "\n"
+#~ "   * ��� �����������: ���� ��� ������� ��������� ����������� � ������ "
+#~ "����������, �������� \"��������� �������\".\n"
+#~ "     ���� �� ������ ������������ �������, ������������ � ��������� Unix "
+#~ "������, �������� \"��������� lpd �������\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     ���� �� ������ ������������ �������, ������������ � ��������� "
+#~ "Microsoft 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"
+#~ "��� ������� - ����������� ��������� ������������ � ������� ������������� "
+#~ "�����. � GNU/Linux\n"
+#~ "�� ���������� \"/dev/lp0\", � Microsoft Windows - \"LPT1\" ."
+
+#~ 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"
+#~ "� ��� ����� ����������� �������������� ���� ��������� �� ��������� ����� "
+#~ "� �� ������� �������� ��, ���� ������� ����� �������� �����������."
+
+#~ 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 ""
+#~ "������ �� ������ ������ ������ ������������ root ��� ����� Mandrake Linux "
+#~ "�������.\n"
+#~ "������ ����� ������ ������, ����� ���������, ��� ��� ������ ��������� .\n"
+#~ "\n"
+#~ "\n"
+#~ "������������ root - ��� ��������� ������������� � ������������ "
+#~ "������������, �������\n"
+#~ "��������� �������� ������������ �������. �������������, ����������� "
+#~ "��������� ������. \n"
+#~ "������������� ������� ������ root ������������ ������ ����� ���� "
+#~ "������������ ��� �����������\n"
+#~ "�������, �� ������ � ������ ������, ����������� � ���.\n"
+#~ "\n"
+#~ "\n"
+#~ "������ ������ �������� �� ���� � ���� � ���� ��� ������� 8\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 ""
+#~ "������ �� ������ ������� ���� ��� ��������� \"�������\" ������� ������� "
+#~ "��� �������������\n"
+#~ ", � ������� �� \"�����������������\" ������� ������ root. �����\n"
+#~ "������� ���� ��� ��������� ������� ������� ��� ������� ������������,\n"
+#~ "������� ����� �������� �� ����������. ��� ������ ������� ������ "
+#~ "������������\n"
+#~ "��������� ���� ��������� (����������� ���������, ��������� ��������, � �."
+#~ "�.)\n"
+#~ "� ���� \"�������� �������\", � ������� �������� ��� \n"
+#~ "���������.\n"
+#~ "\n"
+#~ "\n"
+#~ "������ ����� �������� ������� ������ ��� ����! ���� ���� �� ������ "
+#~ "������������\n"
+#~ "������������� �� ������, �� ������� ������� ��� ������ root\n"
+#~ "��� ������������ ������: ��� ������� ������� ������ ������������. \n"
+#~ "����� ��������� ������� ������� ���������.\n"
+#~ "\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"
+#~ "  - 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 � grub:\n"
+#~ "  - ����������� ����������: ����������� ��� ���������� (��������, ������ "
+#~ "�������� �����,\n"
+#~ "������� �������� ����������� ������. ���� �� �� ������� ��������� ������ "
+#~ "�����, ��\n"
+#~ "��������� \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - �������� ����� ��������� ������ �� ���������: ������ ����� � �������\n"
+#~ "����� ������� � ������� ������� ��������� ��������� ���� ����� ��������� "
+#~ "������� ������.\n"
+#~ "��� ������� ��� ������, ����� ����������� � �������� ����� ����� �����\n"
+#~ "��������� ����������. ��������� �� ����, ���� \"��������\" \n"
+#~ "�� �����������, ��� ����� ����."
+
+#~ 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: \n"
+#~ "�� �������� ��������� GNU/Linux ��� ����� ������ ��, ������������� �� "
+#~ "������.\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"
+#~ "  - 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"
+#~ "  - ��������� ����������: �������, ��� �� ������ ���������� ����������,\n"
+#~ "����������� ��� �������� GNU/Linux. ���� �� ������ �����, ��� �������,\n"
+#~ "��������� \"������ ������ ���������� (MBR)\".\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"
+#~ "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"
+#~ "������� GNU/Linux GUI (����������� ���������������� ���������). ��� ����\n"
+#~ "���� ���� ��������� ���������� � �������. ������� ����� ���� �����\n"
+#~ "����������������, ��� ��� ���� ������ ����� �������� � ��������\n"
+#~ "����������� ��������� � ������������� ��������� ��������� :)\n"
+#~ "\n"
+#~ "\n"
+#~ "����� ���������������� ����������, ����� ������� X (���� �� ��\n"
+#~ "��������� DrakX �� ������ �����) ����� �� ����� ���������, ����������\n"
+#~ "�� ��� ���������. ���� ���, �� ������ ��������� � �������� ��\n"
+#~ "������� ��� ������."
+
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "���� ��� �� �� � ������� � ���������� X, ����������� ��� ��������� ���\n"
+#~ "���������� ��������� X Window System."
+
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "���� �� ������������� ����������� ���� (login), �������� \"��\". ����� "
+#~ "- \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 ""
+#~ "�� ������ ������� ������� ������������ ��� ����� �������. ��������� "
+#~ "���������� �����\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 ""
+#~ "������� ���������� ���������������.\n"
+#~ "\n"
+#~ "����� ������������, ���� ����� ������� Mandrake Linux ���������� "
+#~ "�������������.\n"
+#~ "���� ������ ��������� ������ ������������ �������, ������� \n"
+#~ "�������������� ����������."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "������� (������������)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "��������� (������������)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "��� ������������ �������:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "�������� /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 "����� �������������� ���� ��������,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "��� ������ � ���� �������� ����� ��������"
+
+#~ msgid "Reload"
+#~ msgstr "�������������"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "������ ������������� ����-����������������� ������� ��� ������������ "
+#~ "linux?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "��������� 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 ""
+#~ "� ��������� �������� ������ CUPS, ��� �� ����� ����� �����������\n"
+#~ "������� ���������; �������� ����� ���������� �������������,\n"
+#~ "���� ������ ��� ������ �� ��������� � ������ ����; � ��������� ������\n"
+#~ ", ��� ����� ������� IP ����� ������� CUPS \n"
+#~ "�, ��������, ����� �����."
+
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "��������� �������"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "���������, ���������� ��������� ������ ����������"
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "��� ������"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "����� �������� ��� �����, ��������, web, �������� ������ � ����"
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "��� ��������"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "����������"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "���������� ����"
+
+#~ msgid "Profile "
+#~ msgstr "������� "
+
+#~ msgid "Statistics"
+#~ msgstr "����������"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "�������� ��������: "
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "�������� ���������: "
+
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "��� ����������: "
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "����������� � �������� "
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "������������� �� �������� "
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "������ �������������� �� ��������."
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "������������ �� �������� ���������."
+
+#~ msgid "Connection complete."
+#~ msgstr "���������� ���������."
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "������ ���������.\n"
+#~ "��������� ���� ��������� � ������ ���������� Mandrake."
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "���������"
+
+#~ msgid "sent: "
+#~ msgstr "����������: "
+
+#~ msgid "received: "
+#~ msgstr "��������: "
+
+#~ msgid "Connect"
+#~ msgstr "�������������"
+
+#~ msgid "Disconnect"
+#~ msgstr "�������������"
+
+#~ msgid "/File/_New"
+#~ msgstr "/����/_�����"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/����/_�������"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/����/_���������"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/����/��������� _���"
+
+#~ msgid "/File/-"
+#~ msgstr "/����/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_���������"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/���������/��������"
+
+#~ msgid "/_Help"
+#~ msgstr "/_������"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/������/_� ���������..."
+
+#~ msgid "Default Runlevel"
+#~ msgstr "RunLevel �� ���������"
+
+#~ msgid "Europe"
+#~ msgstr "������"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "������� �������"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "�� ������� ���������� ���������� ����� ��������."
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "�������������� ���� ��������"
+
+#~ msgid "Adapter"
+#~ msgstr "�������"
+
+#, fuzzy
+#~ msgid "Disable network"
+#~ msgstr "���������"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "��������"
+
+#~ 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"
+#~ "������� ��������."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (��� ADSL) ����������"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "�������"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "�� ������ �������� ������� ����� ��� ������������� �������� � 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 "��������� ������� �����"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "�������� ����� ��� PostScript"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "���������� \"����������� ������\"?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "���������� ������� �� �����"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "������/����� ���� � ������� (1/72 �����)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "�������/������ ���� � ������� (1/72 �����)"
 
-#~ msgid "GB"
-#~ msgstr "Gb"
+#~ msgid "Extra GhostScript options"
+#~ msgstr "�������������� ��������� ��� GhostScript"
 
-#~ msgid "KB"
-#~ msgstr "Kb"
+#~ msgid "Extra Text options"
+#~ msgstr "�������������� ��������� ��� ������"
 
-#~ msgid "TB"
-#~ msgstr "Tb"
+#~ msgid "Reverse page order"
+#~ msgstr "�������� ������� �������"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d �����"
+#~ msgid "CUPS starting"
+#~ msgstr "����������� CUPS"
 
-#~ msgid "1 minute"
-#~ msgstr "1 ������"
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "����� ���� ���������� ����������� ��������"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d ������"
+#~ 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"
+#~ "��� �� ����� ���� ������. ����� ��� ����� ������������ ��� ������� "
+#~ "�������� �\n"
+#~ "��� �� �����������?"
+
+#~ 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 ""
+#~ "������ ������� ������, � ������� ���������� ������� ��� ������, ������� "
+#~ "�������� ����� (������ lp) � ���������� � ��� �������� ������� ������. "
+#~ "������� ��� � ������� ������� ������, � ����� ������, ������� ���������� "
+#~ "�������?"
+
+#~ msgid "Name of queue"
+#~ msgstr "��� �������"
+
+#~ msgid "Spool directory"
+#~ msgstr "������� spool"
+
+#, fuzzy
+#~ msgid "fsck failed: "
+#~ msgstr "������ ������������: "
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "����� �������� ������������ �������, ���� ������� \"������������ ������� "
+#~ "����\" \n"
+#~ "� \"������������ ������ MD5\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "���� � ����� ���� ������������ NIS, �������� \"������������ NIS\". ���� \n"
+#~ "�� ������, �������� �������������� ����."
+
+#~ msgid "yellow pages"
+#~ msgstr "������ ��������"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "��������� ��������� ����"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "����� ������� DNS ������� ����������"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "����� ������� DNS ������� ����������"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "��� �� ������ �������������� � ��������?"
diff --git a/perl-install/share/po/sk.po b/perl-install/share/po/sk.po
index 663a18818..6e46f7e79 100644
--- a/perl-install/share/po/sk.po
+++ b/perl-install/share/po/sk.po
@@ -6,32 +6,32 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: 2001-04-19 08:45+0100\n"
-"Last-Translator: Pavol Cvengros <orpheus@hq.alert.sk>\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-08-27 18:02+0100\n"
+"Last-Translator: Jan Matis <damned@hq.alert.sk>\n"
 "Language-Team: sk <i18n@hq.alert.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
-msgstr "Nastavi� v�etky \"hlavy\" osobitne"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
+msgstr "Nastavi� v�etky hlavy osobitne"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Pou�i� Xinerama roz��renie"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Nastavi� iba kartu \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Nastavenie \"viac-hl�v\""
 
-#: ../../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 ""
 "V� syst�m podporuje nastevenie pre \"viac hl�v\".\n"
 "�o chcete spravi�?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Grafick� karta"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Zvo�te grafick� kartu"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Zvo�te 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 "Ak� konfigur�ciu XFree chcete ma�?"
 
-#: ../../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 ""
 "Va�a karta m� podporu hardwarovej 3D akceler�cie ale iba v XFree %s.\n"
 "Va�a karta je podporovan� XFree %s, ktor� maj� lep�iu podporuj v 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 "Va�a karta m� podporu hardwarovej 3D akceler�cie v 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 s 3D hardwerovou akceler�ciou"
 
-#: ../../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 ""
 "POZOR, T�TO PODPORA JE IBA EXPERIMENT�LNA A MO�E SPOSOBI� ZAMRZNUTIE "
 "PO��TA�A."
 
-#: ../../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 s EXPERIMENT�LNOU 3D akceler�ciou"
 
-#: ../../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 ""
 "PO��TA�A.\n"
 "Va�a karta je podporovan� XFree %s, ktor� maj� lep�iu podporuj v 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr "Xpmac (ovl�da� obrazovky pre in�tal�ciu)"
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFree konfigur�cia"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Zvo�te ve�kos� grafickej pam�ti"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Zvo�te parametre servra"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Zvo�te 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"
@@ -151,40 +156,40 @@ msgstr ""
 "schopnosti v�ho monitora. Mohol by sa po�kodi�.\n"
 "Ak ste si nie celkom ist�, zvo�te rad�ej slab�ie nastavenie."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Horizont�lna frekvencia"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Vertik�lna frekvencia"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Nie je nastaven� monitor"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Nie je nastaven� grafick� karta"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Nie s� nastaven� grafick� rozl��enia"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Otestova� konfigur�ciu?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Varovanie: Testovanie tejto grafickej karty m��e sp�sobi� zamrznutie syst�mu"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Test konfigur�cie"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -192,152 +197,156 @@ msgstr ""
 "\n"
 "sk�ste zmeni� niektor� parametre"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Vyskytla sa chyba"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "N�vrat za %d sek�nd"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Je toto spr�vne nastavenie?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Vyskytla sa chyba, sk�ste zmeni� niektor� parametre"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Rozl��enie"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Zvo�te rozl��enie a farebn� h�bku"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafick� karta: %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 "Expertn� m�d"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Zobraz v�etko"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Rozl��enia"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Nastavenie kl�vesnice: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Typ my�i: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Port my�i: %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 "Horizont�lna frekvencia monitoru: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Vertik�lna frekvencia monitoru: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafick� karta: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Grafick� karta: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafick� pam�: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Farebn� h�bka: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rozl��enie: %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 ovl�da�: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Pripravujem konfigur�ciu X-Windows"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "�o chcete robi�?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Zme� monitor"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Zme� grafick� kartu"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Zme� parametre servra"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Zme� rozl��enie"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Zobraz inform�cie"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Sk�s znova"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -350,20 +359,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Pros�m, prihl�ste sa znova do %s aby ste aktivovali zmeny"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Pros�m, odhl�ste sa a potom stla�te Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X pri �tarte"
 
-#: ../../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,215 +425,223 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB a viac"
+msgid "16 MB"
+msgstr "16 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../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 viac"
+
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "�tandardn� VGA, 640�480 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800�600 @ 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 kompatibiln�, 1024�768 @ 87 Hz prekladane (nie je 800�600)"
 
-#: ../../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, 1024�768 @ 87 Hz prekladane, 800�600 @ 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 "Roz��ren� Super VGA, 800�600 @ 60 Hz, 640�480 @ 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 "Neprekladan� SVGA, 1024�768 @ 60 Hz, 800�600 @ 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Vysoko frekven�n� SVGA, 1024�768 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Monitor, ktor� dok�e 1280�1024 @ 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Monitor, ktor� dok�e 1280�1024 @ 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Monitor, ktor� dok�e 1280�1024 @ 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor, ktor� dok�e 1600�1200 @ 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor, ktor� dok�e 1600�1200 @ 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 "Prv� sektor zav�dzacieho oddielu"
 
-#: ../../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 "Prv� sektor disku (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "In�tal�cia 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 "Kam si �el�te nain�talova� zav�dza�?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "In�tal�cia 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 s textovym menu"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO s grafick�m menu"
 
-#: ../../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 "�tart z 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 "Hlavn� parametre zav�dza�a"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Pou�i� zav�dza�"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "In�tal�cia zav�dza�a"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Boot zariadenie"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (nepracuje spr�vne so star��mi BIOSmi)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Kompaktn�"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "kompaktn�"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Video m�d"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Pauza pred �tartom predvolen�ho jadra"
 
-#: ../../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 "Heslo"
 
-#: ../../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 "Heslo (znovu)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Obmedz vo�by pr�kazov�ho riadku"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "obmedz"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Vy�isti� /tmp pri ka�dom �tarte"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Presn� ve�kos� pam�ti (na�iel som %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Dovoli� multi profily"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Zadajte ve�kos� pam�ti v Mb"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Parameter ``Restrict command line options'' je bez pou�itia hesla vypnut�"
 
-#: ../../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 "Pros�m sk�ste znovu"
 
-#: ../../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 "Heslo nes�hlas�"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Inicializa�n� spr�va"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Open Firmware Delay"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Oneskorenie pre �tart kernelu"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Povoli� �tart z CD?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Povoli� �tart z OF?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Predvolen� 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."
@@ -632,146 +649,144 @@ msgstr ""
 "Moment�lne sa tu nach�dzaj� tieto z�znamy.\n"
 "M��ete prid�va� �al�ie, alebo meni� existuj�ce."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Prida�"
 
-#: ../../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 "Hotovo"
 
-#: ../../any.pm_.c:220
-#, fuzzy
+#: ../../any.pm_.c:217
 msgid "Modify"
-msgstr "Modifikuj RAID"
+msgstr "Modifikova�"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Ak� typ z�znamu chcete prida�"
 
-#: ../../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 "In� OS (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "In� OS (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "In� OS (windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Obraz"
 
-#: ../../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 "Pridaj"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "��tanie/Z�pis"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tabu�ka"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Nie celkom bezpe�n�"
 
-#: ../../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 "Z�znam"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Predvo�ba"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Initrd-ve�kos�"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "Bez videa"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Odstr�� z�znam"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Pr�zdny z�znam nie je dovolen�"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Tento z�znam je u� pou�it�"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Ak� typ rozdelenia oddielov?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Na�iel som %s %s rozhranie"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "M�te e�te nejak� �al�ie?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "M�te nejak� %s rozhranie?"
 
-#: ../../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 "Nie"
 
-#: ../../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 "�no"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Prezrite si inform�cie o technick�ch prostriedkoch"
 
 #. -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 "In�talujem ovl�da� pre %s kartu %s"
 
-#: ../../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 "Ktor� %s ovl�da� m�m sk�si�?"
 
-#: ../../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"
@@ -788,20 +803,20 @@ msgstr ""
 "stane, �e toto testovanie po��ta� zablokuje, ale nemalo by sp�sobi� �iadnu "
 "�kodu."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Automatick� zistenie"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Zadajte vo�by"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Teraz m��ete zada� parametre pre modul %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -812,11 +827,11 @@ msgstr ""
 "Parametre s� vo form�te ``meno=hodnota meno2=hodnota2 ...''.\n"
 "Napr�klad: ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Parametre modulu:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -825,33 +840,33 @@ msgstr ""
 "Nahr�vanie modulu %s zlyhalo.\n"
 "Chcete sa o to pok�si� znova s in�mi parametrami?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(u� pridan� %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Toto heslo je pr�li� jednoduch�"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Pros�m zadajte u��vate�sk� meno"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "U��vate�sk� meno m��e obsahova� len mal� p�smen�, ��slice, `-' a `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Tak�to u��vate� je u� pridan�"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Pridaj u��vate�a"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -860,49 +875,62 @@ msgstr ""
 "Zadajte u��vate�a\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Akceptuj u��vate�a"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Re�lne meno"
 
-#: ../../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 "U��vate�sk� meno"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../../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 ""
-"M��em nastavi� v� po��ta� aby automaticky prilogoval nejak�ho u�ivate�a.\n"
-"Ak nechcete vyu�i� t�to mo�nos� stla�te pros�m tla�idlo Zru�i�."
+"M��em nastavi� v� po��ta� aby po re�tarte automaticky sp���al X.\n"
+"Chcete ma� spusten� X-Windows po re�tarte po��ta�a?"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Zvo�te predvolen�ho u�ivate�a:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Vyberte si window mana��ra:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "Pros�m, zvo�te jazyk."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "M��ete zvoli� �al�ie jazyky pou�ite�n� po in�tal�cii"
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "V�etko"
+
 #. -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"
@@ -919,51 +947,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 "Vitajte v zavadzaci operacneho systemu 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 "Pouzite klavesy %c a %c pre oznacenie zaznamu zviraznenim"
 
 #. -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 "Stlacte enter pre zavedenie oznaceneho OS, 'e' pre upravu"
 
 #. -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 "prikazov pred zavedenim, alebo 'c' pre prikazovy riadok"
 
 #. -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 "Oznaceny OS bude zavedeny za %d sekund."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "nie je dos� miesta v /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 "�tart menu"
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Kam si �el�te nain�talova� zav�dza�?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "pomoc zatia� nebola implementovan�.\n"
@@ -976,525 +1009,690 @@ msgstr "Konfigur�cia �t�lu �tartovania"
 msgid "/_File"
 msgstr "/_S�bory"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/S�bor/_Nov�"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/S�bor/_Otvori�"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/S�bor/_Ulo�i�"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>U"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/S�bor/Ulo�i� _ako"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/S�bor/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/S�bor/_Koniec"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>K"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Vo�by"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Vo�by/Test"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Pomoc"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Pomoc/_O..."
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Konfigur�cia"
-
-#: ../../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 ""
-"V�tajte v utilite na zdie�anie pripojenia k internetu!\n"
-"\n"
-"%s\n"
-"\n"
-"Kliknite na Nastavi� ak chcete spusti� sprievodcu nastaven�m."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Lilo/Grub m�d"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "Nov� �t�l kateg�rii monitorov"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "Nov� �t�l monitora"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "�tandardn� monitor"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "�tandardn� Gtk+ monitor"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "Spusti� Auroru pri �tarte"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/Grub m�d"
+
+#: ../../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 ""
+"Moment�lne pou��vate %s ako �tartovac� mana��r.\n"
+"Kliknite na Konfigur�cia pre spustenie sprievodcu nastaven�m."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Konfigur�cia"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "M�d �tartu"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "M�d syst�mu"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "Spusti� X-Window syst�m pri �tarte"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Nie, nechcem automatick� prihl�senie"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "�no, chcem automatick� prihl�senie s (u�ivate�, desktop)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "M�d syst�mu"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Predvo�ba"
-
-#: ../../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 "Zru�"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "nem��em otvori� /etc/inittab na ��tanie: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "nem��em otvori� /etc/sysconfig/autologin na ��tanie: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "nem��em otvori� /etc/inittab na ��tanie: %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 "In�tal�cia LILA zlyhala. Vyskytla sa nasleduj�ca chyba:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Vytvor"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Odpoj"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Zru�"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Form�t"
+#: ../../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 "Zme� ve�kos�"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Typ"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d min�t"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Bod pripojenia"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 min�ta"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Zap�� /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sek�nd"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Prepni do expert m�du"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Pros�m, najprv si za z�lohujte va�e d�ta"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Prepni do norm�lneho m�du"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "��tajte pozorne!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Obnov zo s�boru"
+#: ../../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 ""
+"Ak pl�nujete pou�i� ABOOT, nechajte pros�m na za�iatku disku dos� vo�n�ho "
+"miesta.\n"
+"(2048 sektorov bude sta�i�)"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Ulo� do s�boru"
+#: ../../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 "Chyba"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Sprievodca"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Obnov z diskety"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Nov�"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Ulo� na disketu"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+msgid "Remote"
+msgstr "Vzdialen�"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Zma� v�etko"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Bod pripojenia"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Naform�tuj v�etko"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Parametre"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Automaticky prerozde�"
+#: ../../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 "Typ"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "V�etky prim�rne oddiely s� u� pou�it�"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Odpoj"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Nem��em prida� �al�� oddiel"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Pripoj"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Zvo� akciu"
+
+#: ../../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 ""
-"Ak chcete ma� viac diskov�ch oddielov, tak zma�te jeden z nich, aby sa dal "
-"vytvori� roz��ren� oddiel disku"
+"M�te jeden ve�k� FAT diskov� oddiel\n"
+"(pou��van� MS DOSom alebo WINDOWS).\n"
+"Navrhujem zmeni� jeho ve�kos�\n"
+"(kliknite na�, potom kliknite na \"Zme� ve�kos�\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Nedostatok miesta pre automatick� alok�ciu"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Pros�m kliknite na oddiel"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Sp�"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Pros�m kliknite na oddiel"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Zap�sa� partition tabu�ku"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Pros�m kliknite na oddiel"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Viac"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detaily"
 
-#: ../../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 "pripojenie zlyhalo "
+
+#: ../../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 "Pr�zdna"
 
-#: ../../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 "In�"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Typ s�borov�ho syst�mu:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detaily"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Vytvor"
 
-#: ../../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 ""
-"M�te jeden ve�k� FAT diskov� oddiel\n"
-"(pou��van� MS DOSom alebo WINDOWS).\n"
-"Navrhujem zmeni� jeho ve�kos�\n"
-"(kliknite na�, potom kliknite na \"Zme� ve�kos�\")"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Namiesto toho pou�ite `%s''"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Pros�m, najprv si za z�lohujte va�e d�ta"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Zru�"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "��tajte pozorne!"
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Najprv spravte `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 ""
-"Ak pl�nujete pou�i� ABOOT, nechajte pros�m na za�iatku disku dos� vo�n�ho "
-"miesta.\n"
-"(2048 sektorov bude sta�i�)"
+"Po zmene diskovej oblasti %s bud� v�etky d�ta na tejto oblasti nen�vratne "
+"straten�"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Bu�te opatrn�: t�to oper�cia je nebezpe�n�."
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Kam si �el�te pripoji� zariadenie %s?"
 
-#: ../../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 "Chyba"
+#: ../../diskdrake.pm_.c:500
+msgid "Mount options"
+msgstr "Parametre pripojenia"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Bod pripojenia: "
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
+msgstr "Rozdielne"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Zariadenie:"
+#: ../../diskdrake.pm_.c:525
+msgid "Removable media"
+msgstr "Vymenite�n� m�dium"
 
-#: ../../diskdrake.pm_.c:240
-#, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "Ozna�enie v DOSe: %s (asi)\n"
+#: ../../diskdrake.pm_.c:532
+msgid "Change type"
+msgstr "Zme�te typ"
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "Typ: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Ak� typ s�borov�ho syst�mu chcete??"
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "Meno: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr "H�ad�m mo�n� nfs zdroje"
 
-#: ../../diskdrake.pm_.c:253
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "Start: sector %s\n"
-msgstr "Za�iatok: sektor %s\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr "H�ad�m mo�n� nfs zdroje na serveri %s"
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Ve�kos�: %s"
+#: ../../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:256
-#, c-format
-msgid ", %s sectors"
-msgstr ", %s sektorov"
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Server"
+
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr "H�ad�m mo�n� samba zdroje"
 
-#: ../../diskdrake.pm_.c:258
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Od cylindra %d po cylinder %d\n"
+msgid "Scanning available samba shared resource of server %s"
+msgstr "H�ad�m mo�n� samba zdroje na serveri %s"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Naform�tovan�\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose a partition"
+msgstr "Zvo�te oddiel"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Nenaform�tovan�\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose another partition"
+msgstr "Zvo�te in� oddiel"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Pripojen�\n"
+#: ../../diskdrake_interactive.pm_.c:188
+msgid "Exit"
+msgstr "Koniec"
 
-#: ../../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 "Prepni do expert m�du"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback s�bor(y): %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "Prepni do norm�lneho m�du"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Predvolen� oddiel pre �tart\n"
-"    (MS-DOS boot, nie pre lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Sp�"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Hladina %s\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Pokra�ova�?"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Ve�kos� k�sku %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Koniec bez ulo�enia"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-disky %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Koniec bez zmeny partition tabu�ky?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Meno loopback s�boru: %s"
+#: ../../diskdrake_interactive.pm_.c:237
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "�el�te si ulo�i� zmeny do /etc/fstab"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Automaticky prerozde�"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Zma� v�etko"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Viac"
+
+#: ../../diskdrake_interactive.pm_.c:250
+msgid "Hard drive information"
+msgstr "Inform�cie o pevnom disku"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Nedostatok miesta pre automatick� alok�ciu"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "V�etky prim�rne oddiely s� u� pou�it�"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Nem��em prida� �al�� oddiel"
+
+#: ../../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"
-"Mo�nosti s�, tento oddiel je\n"
-"ovl�daci oddiel, mali by ste\n"
-"ho nechca� samotn�.\n"
+"Ak chcete ma� viac diskov�ch oddielov, tak zma�te jeden z nich, aby sa dal "
+"vytvori� roz��ren� oddiel disku"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Zvo�te typ oddielu"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Pok��am sa obnovi� partition tabu�ku"
+
+#: ../../diskdrake_interactive.pm_.c:287
+#, fuzzy
+msgid "Rescue partition table"
+msgstr "Pok��am sa obnovi� partition tabu�ku"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Zvo�te typ oddielu"
+
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Vymenite�n� m�dium"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Vyber s�bor"
+
+#: ../../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"
-"Tento �pecialny Bootstrap\n"
-"oddiel je pre\n"
-"du�lne �tartovanie syst�mu.\n"
+"Z�lo�n� tabu�ka rozdelenia disku nem� rovnak� ve�kos�\n"
+"Naozaj pokra�ova�?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Pros�m kliknite na oddiel"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Varovanie"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Ve�kos�: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Vlo�te disketu do mechaniky\n"
+"V�etky d�ta na tejto diskete bud� nen�vratne straten�"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometria: %s cylindrov, %s hlavi�iek, %s sektorov\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Pok��am sa obnovi� partition tabu�ku"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-disky %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+msgid "Detailed information"
+msgstr "Detailn� inform�cie"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Typ partition tabu�ky: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Zme� ve�kos�"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "na zbernici %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Presu�"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Pripoj"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Form�t"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Akt�vny"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Pridaj do RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Odober z RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Modifikuj RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Pridaj do LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Odober z RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Odober z LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Modifikuj RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Pou�i loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Zvo� akciu"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Vytvor nov� oddiel"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Po�iato�n� sektor:"
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Ve�kos� v MB: "
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Typ s�borov�ho syst�mu: "
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Bod pripojenia: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Preferencia: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Form�tuje sa loopback s�bor %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Zvo�te typ oddielu"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr "Prep�nam z ext2 na ext3"
+
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "Kam si �el�te pripoji� loopback s�bor %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 ""
+"Nem��em odpoji� oddiel k�m je pou��van� nejakou sp�tnou slu�kou.\n"
+"Odstr��te najsk�r sp�tn� slu�ku"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Po��tam hranice FAT s�borov�ho syst�mu"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Men�m ve�kos�"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Tomuto oddielu sa ned� meni� ve�kos�?"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "V�etky d�ta na tejto oblasti by sa mali zaz�lohova�"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr "Po zmene ve�kosti oddielu %s bud� v�etky d�ta nen�vratne straten�"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Zvolte nov� ve�kos�"
+
+#: ../../diskdrake_interactive.pm_.c:591
+msgid "New size in MB: "
+msgstr "Nov� ve�kos� v MB: "
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Ktor� disk si �el�te posun��?"
+
+#: ../../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 "Ktor� sektor si �el�te posun��?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Pres�vam"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Pres�vam oddiel..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Vyberte existuj�ci RAID pre pridanie"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "nov�"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Vyberte existuj�ci LVM pre pridanie"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM meno?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Tento oddiel nem��e by� pou�it� pre sp�tn� slu�ku"
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Sp�tn� slu�ka"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Meno s�boru sp�tnej slu�ky: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Re�lne meno"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "S�bor je u� pou��van� inou sp�tnou slu�kou, sk�ste in� s�bor"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "S�bor existuje. Pou�i�?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "zariadenie"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "�rove�"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "ve�kos�"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Bu�te opatrn�: t�to oper�cia je nebezpe�n�."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Ak� typ rozdelenia oddielov?"
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1506,7 +1704,7 @@ msgstr ""
 ")Pou��vate LILO a t�m p�dom to nebude pracova�, alebo ho nepou��vate a t�m "
 "p�dom nepotrebujete /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"
@@ -1517,7 +1715,7 @@ msgstr ""
 "valcom 1024, a nem�te zadefinovan� oddiel /boot. \n"
 "Ak pl�nujete pou�i� LILO, pros�m pridajte najprv oddiel /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"
@@ -1527,280 +1725,240 @@ msgstr ""
 "�iaden zav�dza� syst�mu nedok�e zavies� syst�m bez /boot oddielu.\n"
 "Preto dbajte na pridanie /boot oddielu"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Namiesto toho pou�ite `%s''"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Najprv spravte `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 ""
-"Po zmene diskovej oblasti %s bud� v�etky d�ta na tejto oblasti nen�vratne "
-"straten�"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Pokra�ova�?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Koniec bez ulo�enia"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Koniec bez zmeny partition tabu�ky?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Zvo�te typ oddielu"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Ak� typ s�borov�ho syst�mu chcete??"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Na oddiely men�ie ako 32MB nem��ete pou�i� ReiserFS"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Kam si �el�te pripoji� loopback s�bor %s?"
-
-#: ../../diskdrake.pm_.c:538
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Kam si �el�te pripoji� zariadenie %s?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Partition tabu�ka zariadenia %s sa zap��e na disk!"
 
-#: ../../diskdrake.pm_.c:542
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
-msgstr ""
-"Nem��em odpoji� oddiel k�m je pou��van� nejakou sp�tnou slu�kou.\n"
-"Odstr��te najsk�r sp�tn� slu�ku"
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Aby sa �pravy prejavili, mus�te re�tartova� po��ta�"
 
-#: ../../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 "Ak naform�tujete oddiel %s,v�etky predo�l� d�ta sa na �om stratia"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Form�tuje sa"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Form�tuje sa loopback s�bor %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 "Form�tuje sa oddiel %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Po naform�tovan� v�etk�ch oddielov,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "bud� d�ta na t�chto oddieloch nen�vratne zru�en�"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Presu�"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Ktor� disk si �el�te posun��?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sektor"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid zlyhal"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Ktor� sektor si �el�te posun��?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Nedostatok vo�n�ho miesta pre vytvorenie nov�ho oddielu"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Pres�vam"
+#: ../../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 "Pres�vam oddiel..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Nedostatok vo�n�ho miesta pre vytvorenie nov�ho oddielu"
 
-#: ../../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 "Partition tabu�ka zariadenia %s sa zap��e na disk!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Aby sa �pravy prejavili, mus�te re�tartova� po��ta�"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Odstra�ujem LPD..."
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Po��tam hranice FAT s�borov�ho syst�mu"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Zariadenie:"
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Men�m ve�kos�"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "Ozna�enie v DOSe: %s (asi)\n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Tomuto oddielu sa ned� meni� ve�kos�?"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Typ: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "V�etky d�ta na tejto oblasti by sa mali zaz�lohova�"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Meno: "
 
-#: ../../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 "Po zmene ve�kosti oddielu %s bud� v�etky d�ta nen�vratne straten�"
+msgid "Start: sector %s\n"
+msgstr "Za�iatok: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Zvolte nov� ve�kos�"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Ve�kos�: %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 sektorov"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Vytvor nov� oddiel"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Od cylindra %d po cylinder %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Po�iato�n� sektor:"
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Naform�tovan�\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Ve�kos� v MB: "
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Nenaform�tovan�\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Typ s�borov�ho syst�mu: "
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Pripojen�\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Preferencia: "
+#: ../../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 "Tento oddiel nem��e by� pou�it� pre sp�tn� slu�ku"
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Loopback s�bor(y): %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Sp�tn� slu�ka"
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"Predvolen� oddiel pre �tart\n"
+"    (MS-DOS boot, nie pre lilo)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Meno s�boru sp�tnej slu�ky: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Hladina %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "S�bor je u� pou��van� inou sp�tnou slu�kou, sk�ste in� s�bor"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Ve�kos� k�sku %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "S�bor existuje. Pou�i�?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-disky %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Vyber s�bor"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Meno loopback s�boru: %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 ""
-"Z�lo�n� tabu�ka rozdelenia disku nem� rovnak� ve�kos�\n"
-"Naozaj pokra�ova�?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Varovanie"
+"\n"
+"Mo�nosti s�, tento oddiel je\n"
+"ovl�daci oddiel, mali by ste\n"
+"ho nechca� samotn�.\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 ""
-"Vlo�te disketu do mechaniky\n"
-"V�etky d�ta na tejto diskete bud� nen�vratne straten�"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Pok��am sa obnovi� partition tabu�ku"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "zariadenie"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "�rove�"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "ve�kos�"
+"\n"
+"Tento �pecialny Bootstrap\n"
+"oddiel je pre\n"
+"du�lne �tartovanie syst�mu.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Vyberte existuj�ci RAID pre pridanie"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Ve�kos�: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "nov�"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometria: %s cylindrov, %s hlavi�iek, %s sektorov\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Vyberte existuj�ci LVM pre pridanie"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info:"
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "LVM meno?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-disky %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Automatick� odpojenie vyberate�n�ho m�dia"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Typ partition tabu�ky: %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Zachr�ni� partition tabu�ku"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "na zbernici %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Na��ta� znovu"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Mo�nosti: %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 form�tovanie %s zlyhalo"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Nedok�em form�tova� %s na typ %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "pripojenie zlyhalo "
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr "fsck zlyhalo s exit k�dom %d alebo sign�lom %d"
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "nepodarilo sa pripoji�: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "chyba odpojenia %s: %s"
@@ -1813,41 +1971,44 @@ msgstr "jednoduch�"
 msgid "server"
 msgstr "server"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Na oddiely men�ie ako 16MB nem��ete pou�i� JFS"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Na oddiely men�ie ako 32MB nem��ete pou�i� ReiserFS"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Body pripojenia musia za��na� /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Oddiel s bodom pripojenia %s u� existuje\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Kruhov� pripojenia %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 "Nem��ete pou�i� logick� zv�zok LVM pre bod pripojenia %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Tento adres�r by mal osta� na rootovskom s�borovom syst�me"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Pre tento bod pripojenia potrebujete ozajstn� s�borov� syst�m(ext2, "
 "reiserfs)\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Chyba otv�rania %s pre z�pis: %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"
@@ -1856,1304 +2017,1040 @@ msgstr ""
 "mo�n� vytvori� nov� s�borov� syst�my. Skontrolujte v� hardv�r pre zistenie "
 "pr��iny probl�mu."
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Nem�te �iadny oddiel disku!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "Zvo�te si pros�m jazyk pre in�tal�ciu a pou�itie v syst�me."
-
-#: ../../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"
-"Please click on \"Accept\" if you agree with its terms.\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"
-"Please click on \"Refuse\" if you disagree with its terms. Installation will "
-"end without modifying your current\n"
-"configuration."
-msgstr ""
-"Mus�te akceptova� podmienky licencie ak chcete pokra�ova� v in�tal�cii.\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"
-"Pros�m kliknite na \"Akceptuj\" ak s�hlas�te s podmienkami.\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
-"\n"
-"Pros�m kliknite na \"Odmietni\" ak nes�hlasite s podmienkami. In�tal�cia sa "
-"potom ukon�� bezo zmeny aktu�lnej\n"
-"konfigur�cie."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Vyberte najvhodnej�ie rozlo�enie kl�ves z nasleduj�ceho zoznamu"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
+msgstr ""
 
-#: ../../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 ""
-"Ak chcete in� jazyky (okrem toho ktor� ste si zvolili na\n"
-"za�iatku in�tal�cie), ktor� by mali by� pou�ite�n� po in�tal�cii, pros�m "
-"zvo�te\n"
-"si ich zo zoznamu. Ak chcete v�etky, sta�� ak zvol�te \"V�etko\"."
 
-#: ../../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 ""
-"Zvo�te:\n"
-"\n"
-"  - Vlastn� v�ber: Ak Linux u� trochu pozn�te, m��ete si zvoli�\n"
-"     hlavn� pou�itie v�ho po��ta�a. Pozrite si detaily uveden� ni��ie.\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"
-"  - Expert: Ak sa v Linuxe vyzn�te a chcete si presne nastavi� aplik�cie,\n"
-"     ktor� budete pou��va�. Tak ako vo \"Vlastnom v�bere\" si m��ete zvoli�\n"
-"     hlavn� vyu�itie v�ho syt�mu. Ale pros�m, NEVO�TE SI T�TO MO�NOS� "
-"POKIA� NEVIETE\n"
-"     PRESNE �O ROB�TE!"
+"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 ""
-"Rozdielne vo�by pre pou�itie v�ho po��ta�a s�:\n"
-"\n"
-"\t* Pracovn� stanica: ide�lne pre denn� pou��vanie, v kancel�rii alebo "
-"doma.\n"
-"\n"
-"\n"
-"\t* V�voj�rska: pokia� chcete pou��va� v� syst�m hlavne na v�voj programov. "
-"Potom budete ma� nain�talovan�\n"
-"\t  zbierku programov na kompil�ciu, ladenie a form�tovanie zdrojov�ch "
-"k�dov, �i tvorbu softv�rov�ch bal�kov.\n"
-"\n"
-"\n"
-"\t* Server: ak chcete pou��va� po��ta� ako server. Bu� ako s�borov� (NFS "
-"alebo SMB), tla�ov� (Unix lp, alebo\n"
-"    �t�l Microsoft Windows), alebo datab�zov�, �i in�. Nebude ma� "
-"nain�talovan� grafick� prostredia (KDE, GNOME...)"
 
-#: ../../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"
-"\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 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"
+"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 ""
+"Teraz by ste mali zvoli� slu�by, ktor� chcete sp���a� pri �tarte.\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)."
+"Ak pl�nujete pou��va� tento po��ta� ako server pr�stupn� z internetu, mali "
+"by ste\n"
+"povoli� iba slu�by ktor� naozaj potrebujete. "
+
+#: ../../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:108
+#: ../../help.pm_.c:192
 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"
+"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* 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"
+"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"
-"\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 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:160
+#: ../../help.pm_.c:212
 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"
+"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"
-"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"
+" * 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"
-"To partition the selected hard drive, you can use these options:\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"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\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 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"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\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"
-"   * 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"
+" * \"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"
-"   * Undo: you can use this option to cancel your changes.\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"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\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"
-"   * 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"
+" * \"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"
-"   * 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"
+" * \"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 ""
+"Teraz m��ete zvoli�, kam si �el�te in�talova� Linux Mandrake.\n"
+"Ak je pevn� disk pr�zdny, alebo ak in� opera�n� syst�m zaber�\n"
+"v�etok pou�ite�n� priestor, treba disk rozdeli�.\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"
+"Preto�e je efekt rozdelovacieho procesu nen�vratn�, prerozdelenie\n"
+"disku m��e byt pre nesk�sen�ch u��vate�ov stresuj�ce. Tento n�stroj\n"
+"rozde�ovanie disku zjednodu�uje.\n"
 "\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
+"Potrebujete minim�lne dva oddiely. Jeden pre opera�n� syst�m a jeden\n"
+"pre virtu�lnu pam� (tie� naz�van� swap)."
+
+#: ../../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"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\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"
-"When a partition is selected, you can use:\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
 "\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
-"           * Ctrl-d to delete a partition\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"
-"           * Ctrl-m to set the mount point\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"
-"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
+#: ../../help.pm_.c:350
+#, 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"
+"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"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\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"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\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"
-"\"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"
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
+msgstr ""
+"Ka�d� novo definovan� diskov� oddiel mus� by� naform�tovan�.\n"
+"Form�tovanie znamen� vytv�ranie s�borov�ho syst�mu.\n"
 "\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
-"hard drives:\n"
+"Teraz m��ete zvoli�, �i si �el�te form�tova� existuj�ce oddiely aby ste "
+"odstr�nili\n"
+"d�ta, ktor� sa na nich nach�dzaj�. Ak si to �el�te, zvo�te pros�m oddiely, "
+"ktor�\n"
+"si �el�te form�tova�.\n"
+"\n"
+"\n"
+"Nieje nutn� op�tovne form�tova� v�etky existuj�ce oddiely. Ur�ite mus�te\n"
+"form�tova� oddiely obsahuj�ce opera�n� syst�m (napr�klad  \"/\", \"/usr\",\n"
+"alebo \"/var\"  ). Nemus�te v�ak form�tova� oddiely obsahuj�ce d�ta, ktor�\n"
+"chcete zachova� (typicky \"/home\")\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"
+"Pri vo�be oddielov na form�tovanie bu�te opatrn�. V�etky d�ta na "
+"form�tovanom\n"
+"oddiely bud� nen�vratne straten�.\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"
+"Kliknite na \"OK\" ak ste pripraven� form�tova� vybran� oddiely. \n"
 "\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
+"Kliknite na \"Zru�\" ak chcete zvoli� in� oddiely pre in�tal�ciu."
+
+#: ../../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 ""
+"V� nov� Mandrake Linux opera�n� syst�m sa teraz in�taluje.\n"
+"T�to oper�cia m��e trva� nieko�ko min�t v z�vislosti na mno�stve bal��kov\n"
+"ktor� ste zvolili.\n"
+"\n"
+"Pros�m bu�te trpezliv�."
 
-#: ../../help.pm_.c:258
+#: ../../help.pm_.c:384
+#, 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."
+"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 ""
+"Pred t�m, ne� budete pokra�ova�, mali by ste si pozorne pre��ta� podmienky\n"
+"licencie. Pokr�vaj� cel� distrib�ciu Linux Mandrake a ak nes�hlas�te so "
+"v�etk�mi\n"
+"kliknite na tla�itlo Refuse. To okam�ite ukon�� in�tal�ciu. Pre "
+"pokra�ovanie \n"
+"v in�tal�cii stla�te tla�idlo Accept."
 
-#: ../../help.pm_.c:263
+#: ../../help.pm_.c:391
 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"
+"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
 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"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
 "\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE hard drives:\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\" means \"master hard drive on the primary 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"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"When a partition is selected, you can use:\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
 "\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first "
-"disk\n"
-"or partition is called \"C:\")."
+" * 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 ""
 
-#: ../../help.pm_.c:306
-msgid "Please be patient. This operation can take several minutes."
-msgstr "Pros�m bu�te trpezliv�. T�to oper�cia m��e trva� p�r min�t."
-
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:460
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\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"
-"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"
+"\"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"
-"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"
+"\"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"
-"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"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"Click on \"OK\" when you are ready to format partitions.\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"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
 
-#: ../../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..."
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\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 can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\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"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\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"
-"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 ""
-"Ak m�te v�etky CD zo zoznamu, stla�te OK. Ak nem�te\n"
-"�iadne z nich, stla�te Zru�. Ak v�m ch�baj� iba niektor�, odzna�te ich\n"
-"a potom stla�te 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"
-"\n"
-"\n"
-"Please be patient."
+" * 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: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 ""
-"Pros�m zvo�te spr�vny port. Napr�klad COM1\n"
-"port v MS Windows sa vol� ttyS0 v GNU/Linuxe."
-
-#: ../../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"
+"Pros�m zvo�te  \"Install\" ak nem�te nain�talovan� predo�l� verziu Mandrake "
+"Linux-u\n"
+"alebo ak chcete pou��va� viac opera�n�ch syst�mov.\n"
 "\n"
 "\n"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
+"Pros�m zvo�te  \"Update\" ak si �el�te obnovi� u� nain�talovan� star�iu "
+"verziu Mandrake Linux-u.\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 ""
-
-#: ../../help.pm_.c:399
-msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
+"V z�vislosti od va�ich sk�senost� s GNU/Linux-om m��ete zvolit jednu z  "
+"nasleduj�cich �rovn� in�tal�cie\n"
 "\n"
+"* Recommended: Ak ste e�te nikdy nein�talovali GNU/Linux, zvo�te t�to "
+"mo�nos�. In�tal�cia bude\n"
+" ve�mi jednoduch� a budete musie� odpoveda� len na nieko�ko ot�zok.\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 ""
-"Ak v� mod�m je v externom preveden� pros�m zapnite ho teraz aby ho mohol "
-"DrakX automaticky detekova�."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Pros�m zapnite v� mod�m a spr�vne ho zvo�te."
-
-#: ../../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
-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 ""
-"Teraz m��ete zada� meno po��ta�a ak je to potrebn�.\n"
-"Ak ho neviete alebo nieviete �o zada�, informujte sa u v�ho\n"
-"poskytovate�a pripojenia k internetu."
-
-#: ../../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"
+"* Customized: ak ste sa u� s GNU/Linux-om stretli, m��ete si zvoli� z�kladn� "
+"pou�itie v�ho po��ta�a \n"
+" (pracovn� stanica, server, v�vojov� stanica). Budete tie� musie� odpoveda� "
+"na viac ot�zok ako pri \n"
+" Recomended �rovni in�tal�cie.\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 ""
+"* Expert: Ak m�te naozaj dostato�n� sk�senosti s GNU/Linux-om, m��ete zvoli� "
+"t�to triedu in�tal�cie.\n"
+" Tak ako v Customized si budete m�c� zvoli� z�kladn� pou�itie v�ho po��ta�a "
+"(pracovn� stanica, server,\n"
+" v�vojov� stanica). Budete ma� mo�nos� ovplyvni� mnoho detailov in�tal�cie "
+"ale m��e sa V�m sta�, �e \n"
+" nebudete vedie� odpoveda� na niektor� ot�zky. Preto nepou��vajte t�to "
+"�rove� in�tal�cie pokia� sa v \n"
+" GNU/Linux-e naozaj nevyzn�te."
 
-#: ../../help.pm_.c:443
+#: ../../help.pm_.c:521
 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 ""
-"Teraz m��ete zada� meno po��ta�a ak je to potrebn�.Ak ho neviete\n"
-"alebo nieviete �o zada�, informujte sa u v�ho spr�vcu siete."
-
-#: ../../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 ""
-"Teraz m��ete zada� parametre telef�nneho pripojenia k internetu. Ak si\n"
-"nie ste ist�, �o m�te zada�, sp�tajte sa v�ho poskytovate�a internetu."
-
-#: ../../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 ""
-"Ak chcete pou��va� proxy servre, pros�m, nastavte ich teraz.\n"
-"Ak neviete �i budete proxy pou��va�, sp�tajte sa v�ho spr�vcu siete,\n"
-"alebo poskytovate�a internetu."
-
-#: ../../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"
+"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"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
 
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Teraz si m��ete zvoli� �asov� z�nu v ktorej �ijete."
-
-#: ../../help.pm_.c:471
+#: ../../help.pm_.c:534
 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"
+"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 use Microsoft Windows on this computer, choose \"No\"."
+"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:479
+#: ../../help.pm_.c:547
 msgid ""
-"You may now choose which services you want to start at boot time.\n"
-"\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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\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."
+"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:492
+#: ../../help.pm_.c:560
 msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
 msgstr ""
 
-#: ../../help.pm_.c:496
+#: ../../help.pm_.c:564
 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 ""
-
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\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"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\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"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\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"
-"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\"."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:600
 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"
+"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"
-"   * 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"
+" * 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"
-"   * 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 ""
-
-#: ../../help.pm_.c:548
-msgid ""
-"You need to enter some informations here.\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"
-"   * 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"
+"    * \"GRUB\": if you prefer GRUB (text menu).\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"
+"    * \"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"
-"   * 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"
+" * \"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"
-"     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"
+"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 want to acces a printer located on NetWare network, select "
-"\"NetWare\".\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 ""
 
-#: ../../help.pm_.c:573
+#: ../../help.pm_.c:647
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\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"
-"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."
+"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 ""
 
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Teraz mus�te zvoli� va�u tla�iare� zo zoznamu."
-
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:658
 msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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."
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
 msgstr ""
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:665
 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"
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\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 ""
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Pre v��iu bezpe�nos� v�ho syst�mu by ste mali zvoli� \"Pou�i shadow\"\n"
-"a \"Pou�i MD5 hesl�\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"Ak va�a sie� pou��va NIS, nastavte \"Pou�i NIS\". Ak ste si nie ist�, \n"
-"sp�tajte sa v�ho sie�ov�ho spr�vcu."
-
-#: ../../help.pm_.c:617
+" * \"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 ""
-"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"
+"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"
-"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"
+"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"
-"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 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 ""
-"Teraz by ste mali vytvori� aspo� jedno norm�lne u��vate�sk� konto.\n"
-"Norm�lne je vytvori� po jednom konte ka�d�mu �loveku, ktor� m� ma� pr�stup\n"
-"k tomuto syst�mu. Ka�d� u��vate�sk� konto m� vlastn� nastavenia (grafick�ho\n"
-"prostredia, programov) a vlastn� u��vate�sk� adres�r, v ktorom s� tieto\n"
-"nastavenia ulo�en�.\n"
+"DrakX sa pok�si vyh�ada� PCI SCSI radi�e. Ak DrakX n�jde SCSI\n"
+"adapt�r a rozpozn� ak� ovl�da� pou�i�, bude automaticky nain�talovan�.\n"
 "\n"
 "\n"
-"Najsk�r vytvorte u��vate�sk� konto pre seba. Aj ke� budete jedin�m\n"
-"u��vate�om syst�mu, nemali by ste sa norm�lne prihlasova� ako Root.\n"
-"Sp�sobuje to toti� ve�k� bezpe�nostn� riziko.\n"
+"Ak nem�te SCSI radi�, alebo m�te (ISA, PCI) SCSI adapt�r, ktor� DrakX\n"
+"nerozoznal. Budete musie� odpoveda� �i m�te SCSI radi�. V pr�pade, �e\n"
+"zvol�te �no, zobraz� sa zoznam ovl�da�ov z ktor�ch si budete m�c� \n"
+"vybra� vhodn� pre v� SCSI radi�.\n"
 "\n"
 "\n"
-"Mali by ste sa prihlasova� ako norm�lny pou��vate� a Root konto by ste mali\n"
-"pou��va� iba na konfigur�ciu �i administr�ciu."
+"V pr�pade, �e budete sami vybera� vhodn� ovl�da�, DrakX v�m d� mo�nos�\n"
+"�pecifikova� jeho parametre. Taktie� budete musie� dovoli� test hardv�ru\n"
+"na funk�nos� ovl�da�a a jeho parametrov."
 
-#: ../../help.pm_.c:636
+#: ../../help.pm_.c:720
 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"
-"\n"
-"\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"Pros�m zadajte kam maju by� ulo�en�\n"
-"inform�cie potrebn� pre �tart GNU/Linux.\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"
-"Pokia� si nie ste ist�, zvo�te \"Prv� sektor na disku (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 ""
-"Ak nie ste presved�en� o inej vo�be, zvy�ajne sa sem zapisuje \"/dev/hda\"\n"
-"(to je master disk na prim�rnom radi�i) alebo \"/dev/sda\" (prv� SCSI disk)."
-
-#: ../../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"
+"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"
-"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 ""
-
-#: ../../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"
+" * 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"
-"  - 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"
+" * 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"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\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"
-"  - 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"
+" * 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"
-"  - 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."
+" * 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:697
+#: ../../help.pm_.c:765
 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"
+"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"
+" * 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 ""
 
-#: ../../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"
+"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"
-"  - Root: The root device or '/' for your Linux installation.\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"
-"  \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"
-"\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"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\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"
+" * \"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"
-"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 ""
 
-#: ../../help.pm_.c:805
+#: ../../help.pm_.c:827
 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 ""
 
-#: ../../help.pm_.c:818
+#: ../../help.pm_.c:832
 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."
-msgstr ""
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"Ak nie je konfigur�cia X windows �plne v poriadku, pou�ite t�to vo�bu pre\n"
-"spr�vne nastavenie."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Ak uprednost�ujete grafick� login, zvo�te \"�no\". Inak zvo�te \"Nie\"."
-
-#: ../../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"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
 
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"Re�tartujem v� syst�m.\n"
-"\n"
-"Po re�tarte syst�mu sa automaticky zavedie v� Linux Mandrake.\n"
-"Ak chcete zavies� in� existuj�ci opera�n� syst�m, pre��tajte si pros�m\n"
-"dodatkov� in�trukcie."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Vo�ba jazyka"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Vo�ba triedy in�tal�cie"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Detekcia pevn�ho disku"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Konfigur�cia my�i"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "V�ber kl�vesnice"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Bezpe�nos�"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "S�borov� syst�my"
 
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Form�tovanie oddielov"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "V�ber bal�kov"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "In�tal�cia syst�mu"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Nastavenie root hesla"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Vytv�ranie u��vate�ov"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Sie�ov� slu�by"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Zhrnutie"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Nastavenie slu�ieb"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Zav�dzacia disketa"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "In�tal�cia zav�dza�a"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Konfigur�cia X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Koniec in�tal�cie"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3167,21 +3064,32 @@ msgid ""
 "\n"
 "Do you really want to install these servers?\n"
 msgstr ""
+"Zvolili ste nasleduj�ce slu�by: %s\n"
+"\n"
+"\n"
+"Tieto slu�by sa sp���aj� implicitne. Moment�lne nemaj� �iadne zn�me "
+"bezpe�nostn�\n"
+"chyby, ale v bud�cnosti nejak� m��u by� n�jden�. V tom pr�pade mus�te prejs� "
+"na\n"
+"vy��iu verziu �o najsk�r.\n"
+"\n"
+"\n"
+"Naozaj si �el�te in�talova� tieto slu�by?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
-msgstr ""
+msgstr "Nem��em pou�i� broadcast bez NIS dom�ny"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Vlo�te disketu s FAT form�tom do mechaniky %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "T�to disketa nem� FAT format"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3189,30 +3097,20 @@ msgstr ""
 "Pre pou�itie tohto ulo�en�ho v�beru bal��kov, na�tartujte in�tal�ciu s "
 "``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Chyba pri ��tan� zo s�boru %f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "chyba pri ��tan� zo s�boru %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 "Pros�m otestujte my�."
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Pre aktiv�ciu my�i,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "POHNITE KOLIESKOM!"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3222,7 +3120,7 @@ msgstr ""
 "Nejaky hardware vo va�om po��ta�i potrebuje ``proprietarne'' ovl�da�e.\n"
 "Inform�cie m��ete n�js� na: %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"
@@ -3232,11 +3130,11 @@ msgstr ""
 "Vytvorte oddiel (alebo kliknite na existuj�cu).\n"
 "Potom zvo�te akciu ``Bod pripojenia`` a nastavte na `/'"
 
-#: ../../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 "Mus�te nastavi� swap oddiel"
 
-#: ../../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"
@@ -3246,55 +3144,59 @@ msgstr ""
 "\n"
 "Napriek tomu pokra�ova�?"
 
-#: ../../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 "Mus�te ma� FAT oddiel pripojen� na /boot/efi"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Pou�i vo�n� miesto"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Nedostatok vo�n�ho miesta pre vytvorenie nov�ho oddielu"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Pou�i existuj�ci oddiel"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Tu nieje �iadny pou�ite�n� oddiel"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Pou�i oddiel s Windows pre loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Ktor� oddiel chcete pou�i� pre Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Zvo�te ve�kosti"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Ve�kos� kore�ov�ho oddielu v MB: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Ve�kos� oddielu v MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Pou�i vo�n� miesto na Windows oddiele"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Ktor�mu oddielu chcete zmeni� ve�kos�?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Po��tam hranice s�borov�ho syst�mu pre Windows"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3303,13 +3205,13 @@ msgstr ""
 "Meni� ve�kosti FAT nebol schopny pracova� s oddielom, \n"
 "nastala chyba: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Va� oddiel s Windows je ve�mi fragmentovan�, pros�m spustite najprv  "
 "``defrag''"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3326,21 +3228,21 @@ msgstr ""
 "a defrag. Ak ste to e�te neurobili, ukon�ite in�tal�ciu a urobte to teraz.\n"
 "Bolo by tie� vhodn� zaz�lohova� va�e d�ta. Ak viete �o rob�te, stla�te Ok."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Ko�ko chcete necha� pre windows"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "oddiel %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Ne�spe�n� zmena ve�kosti 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)"
@@ -3348,32 +3250,32 @@ msgstr ""
 "Nieje tu oddiel FAT, ktor�mu by sa dala zmeni� ve�kos� alebo pou�i� ho pre "
 "loopback (alebo tam nieje dostatok vo�n�ho miesta)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Vyma� cel� disk"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Odstr�ni� 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 "M�te viac ako jeden disk, na ktor� chcete in�talova� 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 "V�etky oddiely a d�ta na nich budu straten� na disku %s"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Vlastn� rozdelenie disku"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Pou�i� fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3382,28 +3284,28 @@ msgstr ""
 "Teraz m��ete rozdeli� v� pevn� disk %s.\n"
 "Ke� skon��te, nezabudnite ulo�i� zmeny pomocou `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Nem�te dostatok vo�n�ho miesta na oddiele s Windows"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "Nem��em n�js� miesto pre in�tal�ciu"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX sprievodca rozdelen�m disku na�iel tieto rie�enia:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Ne�spe�ne rozde�ovanie: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Sp���am pr�cu so sie�ou"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Ukon�ujem pr�cu so sie�ou"
 
@@ -3415,12 +3317,12 @@ msgstr ""
 "Vyskytla sa chyba a neviem ju �plne vyrie�i�.\n"
 "Pokra�ujte na vlastn� zodpovednos�."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Dvojn�sobn� bod pripojenia %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"
@@ -3431,16 +3333,16 @@ msgstr ""
 "Je mo�n�, �e s� po�koden� v� CD disk alebo mechanika.\n"
 "Skontrolujte to napr�klad pou�it�m \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Vitajte v %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Nie je dostupn� �iadna floppy mechanika"
 
-#: ../../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"
@@ -3454,32 +3356,32 @@ msgstr "Zvo�te ve�kos� ktor� chcete nain�talova�"
 msgid "Total size: "
 msgstr "Celkov� ve�kos�: "
 
-#: ../../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 "Verzia: %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 "Ve�kos�: %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 "Zvo�te bal�ky, ktor� chcete nain�talova�"
 
-#: ../../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 "In�tal�cia"
 
-#: ../../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 "In�talujem"
 
@@ -3487,7 +3389,7 @@ msgstr "In�talujem"
 msgid "Please wait, "
 msgstr "Pros�m �akajte, "
 
-#: ../../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 "Zvy�n� �as "
 
@@ -3496,21 +3398,21 @@ msgid "Total time "
 msgstr "Celkov� �as "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Pripravujem in�tal�ciu"
 
-#: ../../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 "In�talujem bal�k %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 "Napriek tomu pokra�ova�?"
 
-#: ../../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 "Chyba pri zora�ovan� zoznamu bal�kov:"
 
@@ -3518,29 +3420,33 @@ msgstr "Chyba pri zora�ovan� zoznamu bal�kov:"
 msgid "Use existing configuration for X11?"
 msgstr "Pou�i� existuj�cu konfigur�ciu 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 ""
 "V� syst�m m� nedostatok prostriedkov. Mo�no budete ma� probl�my s\n"
-"in�tal�ciou Linux-Mandrake. Ak sa tak stane, sk�ste textov� in�tal�ciu. Pre "
+"in�tal�ciou Mandrake Linux. Ak sa tak stane, sk�ste textov� in�tal�ciu. Pre "
 "jej\n"
 "spustenie stla�te `F1' po na�tartovan� z CDROMky a zadajte `text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Trieda in�tal�cie"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Pros�m, zvo�te jednu z nasleduj�cich tried in�tal�cie:"
 
-#: ../../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 "Celkov� ve�kos� skup�n, ktor� ste ozna�ili je pribli�ne %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"
@@ -3555,7 +3461,7 @@ msgstr ""
 "Pri mal�ch percent�ch sa bud� in�talova� iba naozaj d�le�it� bal�ky\n"
 "a ak zvol�te 100%% nain�taluje sa v�etko."
 
-#: ../../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"
@@ -3572,84 +3478,68 @@ msgstr ""
 "Pri mal�ch percent�ch sa bud� in�talova� iba naozaj d�le�it� bal�ky\n"
 "Ak nech�te  %d%% nain�taluje sa to�ko bal�kov, ko�ko bude mo�n�."
 
-#: ../../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 "V �al�om kroku budete ma� mo�nos� nastavi� presnej�ie"
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Percentu�lny po�et bal�kov pre in�tal�ciu"
 
-#: ../../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 "V�ber skup�n bal�kov"
 
-#: ../../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 "Osobitn� vo�ba bal�kov"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "Zobraz automaticky zvolen� bal��ky"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Uk� strom"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Skri strom"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Priame, alebo skupinov� triedenie"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Celkov� ve�kos�: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Chybn� bal�k"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Meno: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "D�le�it�: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Celkov� ve�kos�: %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 ""
 "Nem��ete ozna�i� tento bal�k preto�e na jeho in�tal�ciu nie je dos� miesta."
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Bud� nain�talovan� nasleduj�ce bal�ky"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Nasleduj�ce bal�ky bud� odstr�nen�"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "M��ete ozna�i�/odzna�i� tento bal�k"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Toto je jeden zo z�kladn�ch bal�kov, nem��e by� odzna�en�"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "Nem��ete odzna�i� tento bal�k. Je u� nain�talovan�"
 
-#: ../../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?"
@@ -3657,24 +3547,40 @@ msgstr ""
 "Tento bal�k potrebuje nov�iu verziu\n"
 "Ste si ist�, �e ho chcete odzna�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 "Nem��ete odzna�i� tento bal�k. Mus�te prida� nov� verziu"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Zobraz automaticky zvolen� bal��ky"
+
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "Nahra�/Ulo�i� na disketu"
+
+#: ../../install_steps_gtk.pm_.c:461
+msgid "Updating package selection"
+msgstr "Aktualiz�cia vo�by bal��kov"
+
+#: ../../install_steps_gtk.pm_.c:466
+msgid "Minimal install"
+msgstr "Minim�lna in�tal�cia"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Odhadujem"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Pros�m �akajte, pripravujem in�tal�ciu"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d bal�ky"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -3706,15 +3612,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 "Akceptuj"
 
-#: ../../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 "Odmietni"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -3728,7 +3634,7 @@ msgstr ""
 "Pros�m, vlo�te CD-ROM nazvan� \"%s\" do va�ej mechaniky a zvo�te OK.\n"
 "Ak tak� CD disk nem�te, zvo�te Zru� pre zru�enie in�tal�cie z tohoto disku."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Po�as in�tal�cie bal�kov sa vyskytla chyba:"
 
@@ -3736,34 +3642,21 @@ msgstr "Po�as in�tal�cie bal�kov sa vyskytla chyba:"
 msgid "An error occurred"
 msgstr "Vyskytla sa chyba"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Pros�m, zvo�te jazyk."
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "M��ete zvoli� �al�ie jazyky pou�ite�n� po in�tal�cii"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "V�etko"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "S�hlas s licenciou"
 
-#: ../../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"
@@ -3817,7 +3710,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"
@@ -3854,7 +3747,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"
@@ -3875,13 +3768,13 @@ msgid ""
 msgstr ""
 "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"
@@ -3935,7 +3828,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"
@@ -3972,7 +3865,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"
@@ -3991,103 +3884,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 "Kl�vesnica"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Pros�m, zvo�te v� typ kl�vesnice"
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "Tu je zoznam dostupn�ch kl�vesnic"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Trieda in�tal�cie"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Ak� in�tala�n� triedu chcete pou�i�?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "In�tal�cia/Aktualiz�cia"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Toto je in�tal�cia alebo aktualiz�cia?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Odpor��ane"
 
-#: ../../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 "Aktualiz�cia"
 
-#: ../../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 "Pros�m, zvo�te typ va�ej my�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 "Port my�i"
 
-#: ../../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 "Pros�m zvo�te, ktor�mu s�riov�mu portu je va�a my� pripojen�."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "Emul�cia tla�idiel"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "Emul�cia druh�ho tla�idla"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "Emul�cia tretieho tla�idla"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Konfigurujem PCMCIA karty..."
 
-#: ../../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 "Konfigurujem 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 "nie s� dostupn� �iadne oddiely"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Preh�ad�vam oddiely na body pripojenia"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Zvo�te body pripojenia"
 
-#: ../../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"
@@ -4104,7 +3993,7 @@ msgstr ""
 "\n"
 "Povolite str�tu oddielu?\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!"
@@ -4112,77 +4001,116 @@ msgstr ""
 "DiskDrake nedok�zal korektne na��ta� tabu�ku rozdelenia disku.\n"
 "Pokra�ujte na vlastn� riziko!"
 
-#: ../../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 "Nena�iel som kore�ov� oddiel pre upgrade"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Kore�ov� oddiel"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Ktor� je kore�ov� oddiel va�ej in�tal�cie?"
 
-#: ../../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 "Aby sa prejavily �pravy partition tabu�ky, mus�te re�tartova�"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "V�ber oddielov pre form�tovanie"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Kontrola chybn�ch blokov?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Form�tuje sa"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Vytv�ram a form�tujem s�bor %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Nedostato�ne ve�k� swap pre dokon�enie in�tal�cie, pros�m zv��i�"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "H�ad�m dostupn� bal�ky"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "H�ad�m bal�ky pre aktualiz�ciu"
 
-#: ../../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 "V� syst�m nem� dos� miesta pre in�tal�ciu alebo upgrade (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "�plna (%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 "Odporu�en� (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Vlastn� v�ber"
 
-#: ../../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 ""
+"Pros�m zvo�te na��ta�, alebo ulo�i� v�ber bal��kov na disketu.\n"
+"Form�t je tak� ist� ako diskety generovan� automatickou\n"
+"in�tal�ciou."
+
+#: ../../install_steps_interactive.pm_.c:525
+msgid "Load from floppy"
+msgstr "Nahra� z diskety"
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "Nahr�vam z diskety"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "V�ber bal��kov"
+
+#: ../../install_steps_interactive.pm_.c:532
+msgid "Insert a floppy containing package selection"
+msgstr "Vlo�te do mechaniky disketu s zoznamom bal��kov"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Ulo� na disketu"
+
+#: ../../install_steps_interactive.pm_.c:605
+msgid "Selected size is larger than available space"
+msgstr "Zvolen� ve�kos� je v��ia ako dostupn� miesto"
+
+#: ../../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"
@@ -4192,12 +4120,12 @@ msgstr ""
 "Ak nem�te �iadne, stla�te Zru�.\n"
 "Ak v�m ch�baj� iba niektor�, odzna�te ich a potom stla�te OK."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ozna�en� \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -4206,11 +4134,21 @@ msgstr ""
 "In�talujem bal�k %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Poin�tala�n� konfigur�cia"
 
-#: ../../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 "Vlo�te �tartovaciu disketu do mechaniky %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Vlo�te Update Modules disketu do mechaniky %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -4269,93 +4207,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 "Vyberte miror, z ktor�ho chcete stiahnu� bal�k"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Prip�jam sa k miroru a s�ahujem zoznam mo�n�ch bal�kov"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Pros�m zvo�te bal�ky, ktor� chcete nain�talova�."
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Ktor� je va�e �asov� p�smo?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "S� va�e hardv�rov� hodiny nastaven� na GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+msgid "Hardware clock set to GMT"
+msgstr "Hardv�rove hodiny nastaven� na 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 "Automatick� synchroniz�cia �asu (pomocou NTP)"
+
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "NTP server"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Vzdialen� CUPS server"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Bez tla�iarne"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Zhrnutie"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "My�"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "�asov� z�na"
 
-#: ../../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 "Tla�iarne"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "ISDN karta"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Zvukov� karta"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "TV karta"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Ak� typ tla�ov�ho syst�mu chcete pou��va�?"
+#: ../../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 "Lok�lne s�bory"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Nastavenie root hesla"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Bez hesla"
 
-#: ../../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 "Toto heslo je pr�li� jednoduch�(mus� by� minim�lne %d znakov dlh�)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Pou�i NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autentifik�cia"
+
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "Autentifik�cia LDAP"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "�lt� str�nky"
+#: ../../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 server"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
 msgstr "NIS autentifik�cia"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS dom�na"
 
-#: ../../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 "
@@ -4376,25 +4354,25 @@ msgstr ""
 "bez z�vislosti na obvyklom zav�dza�i. Hod� sa to, pokia� nechcete na va�om\n"
 "syst�me in�talova� SILO, in� opera�n� syst�m SILO odstr�ni, alebo\n"
 "SILO nepracuje spr�vne s va��m hardv�rom. Individu�lna zav�dzacia disketa\n"
-"m��e by� tie� pou�it� spolu s Linux Mandrake z�chrannou disketou, �o \n"
+"m��e by� tie� pou�it� spolu s Mandrake Linux z�chrannou disketou, �o \n"
 "podstatne u�ah�� zotavenie sa z v�nych ch�b syst�mu.\n"
 "\n"
 "Ak si �el�te vytvori� zav�dzaciu disketu pre v� syst�m, vlo�te disketu do\n"
 "prvej mechaniky a stla�te \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Prv� floppy mechanika"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Druh� floppy mechanika"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Vynechaj"
 
-#: ../../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 "
@@ -4411,37 +4389,45 @@ msgstr ""
 "bez z�vislosti na obvyklom zav�dza�i. Hod� sa to, pokia� nechcete na va�om\n"
 "syst�me in�talova� LILO (�i GRUB), in� opera�n� syst�m LILO odstr�ni, alebo\n"
 "LILO nepracuje spr�vne s va��m hardv�rom. Individu�lna zav�dzacia disketa\n"
-"m��e by� tie� pou�it� spolu s Linux Mandrake z�chrannou disketou, �o \n"
+"m��e by� tie� pou�it� spolu s Mandrake Linux z�chrannou disketou, �o \n"
 "podstatne u�ah�� zotavenie sa z v�nych ch�b syst�mu.\n"
 "\n"
 "�el�te si vytvori� zav�dzaciu disketu pre v� syst�m?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Prep��te, nena�iel som �iadnu disketov� mechaniku"
 
-#: ../../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 "Zvo�te floppy mechaniku v ktorej chcete vytvori� boot disketu"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Vlo�te disketu do mechaniky %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Vytv�ram bootdisk"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Pripravuje sa zav�dza�"
 
-#: ../../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 "Chcete pou�i� 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?"
@@ -4449,51 +4435,54 @@ msgstr ""
 "Chyba in�tal�cie aboot.\n"
 "Sk�si� silov� in�tal�ciu s mo�nos�ou zni�enia prv�ho oddielu?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "In�tal�cia zav�dza�a"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "In�tal�cia zav�dza�a zl�hala. Vyskytla sa nasleduj�ca chyba:"
 
-#: ../../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 "Slab�"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Stredn�"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Vysok�"
 
-#: ../../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 "Vo�ba bezpe�nostnej �rovne"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "�el�te si vytvori� auto in�tala�n� disketu na replik�ciu linuxu?"
-
-#: ../../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 "Vlo�te �ist� disketu do mechaniky %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 "Pripravujem auto in�tala�n� disketu"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -4503,24 +4492,29 @@ msgstr ""
 "\n"
 "Naozaj chcete teraz skon�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 ""
+"Gratulujeme! In�tal�cia je kompletn�.\n"
+"Vyberte zav�dzacie m�dium (disketa, CD) a sta�te enter\n"
+"pre re�tart po��ta�a.\n"
+"Inform�cie o oprav�ch tejto verzie Mandrake Linux-u m��ete n�jst nahttp://"
+"www.mandrakelinux.com/."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Pr�prava auto in�tala�nej diskety"
 
-#: ../../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"
@@ -4528,42 +4522,60 @@ msgid ""
 "\n"
 "You may prefer to replay the installation.\n"
 msgstr ""
+"Automatick� in�tal�cia m��e by� plne automatizovan�\n"
+"v tom pr�pade v�ak in�tal�cia zaberie cel� pevn� disk.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automatick�"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Prehra�"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Ulo�i� vo�bu bal�kov"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "In�tal�cia Linux-Mandrake %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "In�tal�cia 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> medzi polo�kami  |  <Medzera> ozna�uje  |  <F12> �alej"
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "ch�ba kdesu"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+msgid "Choose a file"
+msgstr "Zvo�te s�bor"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Roz��rene"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Pros�m �akajte"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Uk� strom"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Skri strom"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Priame, alebo skupinov� triedenie"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -4589,267 +4601,285 @@ msgstr "Va�a vo�ba? (predvolen� %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Va�a vo�ba? (predvolen� %s vlo�te `none' pre ni� "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "�esk� (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 "Nemeck�"
 
-#: ../../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 "�panielska"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "F�nska"
 
-#: ../../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�zska"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "N�rska"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Polsk�"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Rusk�"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "�v�dska"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "UK kl�vesnica"
 
-#: ../../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 kl�vesnica"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "Alb�nska"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Arm�nska (star�)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Arm�nska (p�sac� stroj)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Arm�nska (fonetick�)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbajd�an (latin)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbajd�an (cyrillic)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belgick�"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bulharsk�"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Braz�lska"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Bielorusk�"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "�vaj�iarska (Nemeck� rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "�vaj�iarska (Franc�zske rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "�esk� (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "�esk� (Programatorsk�)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Nemeck� (bez m�tvych kl�ves)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "D�nska"
 
-#: ../../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 (N�rska)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Est�nska"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruz�nska (\"Rusk�\" rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruz�nska (\"Latin\" rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Gr�cka"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Ma�arsk�"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Chorv�tska"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Izraelsk�"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Izraelsk� (fonetick�)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Ir�nska"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Islandsk�"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Talianska"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japonsk� 106 kl�ves"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "K�rejska kl�vesnica"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latinsko Americk�"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Maced�nska"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Holandsk�"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litovsk� AZERTY (star�)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litovsk� AZERTY (nov�)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litovsk� QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litovsk� \"fonetick�\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Umiestnenie"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Maced�nska"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Holandsk�"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Po�sk� (qwerty rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Po�sk� (qwertz rozlo�enie kl�ves)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugalsk�"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanadsk� (Quebec)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "Rom�nska (Yawerty)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "Rom�nska (Yawerty)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "Rusk� (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "�v�dska"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Slovinsk�"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovensk� (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slovensk� (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Slovensk� (Programatorsk�)"
+#: ../../keyboard.pm_.c:229
+msgid "Serbian (cyrillic)"
+msgstr "Srbsk� (cyrillic)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Thaisk� kl�vesnica"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+msgid "Tajik keyboard"
+msgstr "Tajik kl�vesnica"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Tureck� (tradi�n� \"F\" model)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Tureck� (modern� \"Q\" model)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukrainsk�"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "US kl�vesnica (medzin�rodn�)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamsk� \"numerick�\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
-msgstr "Juhoslovansk� (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+msgid "Yugoslavian (latin)"
+msgstr "Juhoslovansk� (latin)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Kruhov� pripojenia %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Odstra�te najprv logick� zv�zky\n"
 
@@ -4961,170 +4991,225 @@ msgstr "ni�"
 msgid "No mouse"
 msgstr "�iadna my�"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Pros�m otestujte my�."
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Pre aktiv�ciu my�i,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "POHNITE KOLIESKOM!"
+
+#: ../../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 "Dokon�i�"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "�al�� ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Predch�dzaj�ce"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Je to spr�vne?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Konfigur�cia internetu"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Pripojenie k internetu"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Chcete sa sk�si� pripoji� teraz k internetu?"
+#: ../../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 ""
+"Najpou�ivanej�ie pripojenie s adsl je pppoe.\n"
+"Av�ak existuj� pripojenia ktor� pou��vaju pptp alebo dhcp.\n"
+"Ak neviete �o pou�i�, tak zvo�te 'pou�i pppoe'"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Testovanie pripojenia..."
+#: ../../network/adsl.pm_.c:22
+#, fuzzy
+msgid "Alcatel speedtouch usb"
+msgstr "speedtouch usb"
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
-msgid "The system is now connected to Internet."
-msgstr "Syst�m je teraz pripojen� k internetu."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "pou�i� dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Z bezpe�nostn�ch d�vodov bude teraz odpojen�."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "pou�i pppoe"
+
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "pou�i 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 ""
-"Syst�m prevdepodobne nieje pripojen� k internetu.\n"
-"Sk�ste prekonfigurova� pripojenie."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Konfigur�cia siete"
-
-#: ../../netconnect.pm_.c:222 ../../netconnect.pm_.c:266
-#: ../../netconnect.pm_.c:276 ../../netconnect.pm_.c:283
-#: ../../netconnect.pm_.c:293
-msgid "ISDN Configuration"
-msgstr "Konfigur�cia ISDN"
+"Ktor� dhcp klient chcete pou�i�?\n"
+"�tandardn� je 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 ""
-"Zvo�te si poskytovate�a.\n"
-"Ak nieje v zozname, zvo�te Unlisted"
+"Vo va�om syst�me nebol n�jden� sie�ovy ethernet adapt�r.\n"
+"Nem��em nastavi� po�adovan� typ pripojenia."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Konfigur�cia pripojenia"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Zvo�te sie�ove rozhranie"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Pros�m vypl�te alebo za�krtnite pol��ka"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Pros�m zvo�te si ktor� sie�ov� zariadenie budete pou��va� na pripojenie k "
+"internetu"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ karty"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "nena�iel som sie�ov� kartu"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "DMA karty"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Konfigurujem sie�"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "IO karty"
+#: ../../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 ""
+"Pros�m zadajte meno v�ho po��ta�a ak ho viete.\n"
+"Niektor� DHCP servre ho vy�aduj� pre svoju funk�nos�.\n"
+"Meno v�ho po��ta�a by malo byt plne kvalifikovan� host name,\n"
+"ako napr�klad ``hq.alert.sk''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "IO_0 karty"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "N�zov po��ta�a"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "IO_1 karty"
+#: ../../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 "Sprievodca konfigur�ciou siete"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Va�e osobn� telef�nne ��slo"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Extern� ISDN modem"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Meno poskytovate�a (napr. provider.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Intern� ISDN karta"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Telef�nne ��slo poskytovate�a"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Ak� typ ISDN pripojenia m�te?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "DNS 1 poskytovate�a"
+#: ../../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 ""
+"Ktor� typ nastavenia ISDN uprednotn�te?\n"
+"\n"
+"* Star� typ pou��va isdn4net. Obsahuje siln� n�stroje, ale\n"
+"  �a�ko sa nastavuje.\n"
+"\n"
+"* Nov� typ je jednoduch�ie pochopite�n�, ale obsahuje menej\n"
+"  n�strojov.\n"
+"\n"
+"Doporu�ujeme pou�i� nov� typ nastavenia ISDN.\n"
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "DNS 2 poskytovate�a"
+#: ../../network/isdn.pm_.c:54
+msgid "New configuration (isdn-light)"
+msgstr "Nov� konfigur�cia (isdn-light)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "M�d vyt��ania"
+#: ../../network/isdn.pm_.c:54
+msgid "Old configuration (isdn4net)"
+msgstr "Star� konfigur�cia (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Meno ��tu (u�ivate�sk� meno)"
+#: ../../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 "Konfigur�cia ISDN"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Heslo ��tu"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Zvo�te si poskytovate�a.\n"
+"Ak nieje v zozname, zvo�te Unlisted"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Eur�pa"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol"
+msgstr "Eur�psky protokol"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
-msgstr "Eur�pa (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol (EDSS1)"
+msgstr "Eur�psky protokol (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
-msgstr "Ostatok sveta"
+#: ../../network/isdn.pm_.c:184
+msgid "Protocol for the rest of the world"
+msgstr "Protokol pre zvy�ok sveta"
 
-#: ../../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 ""
-"Zvy�ok sveta \n"
+"Protokol pre zvy�ok sveta \n"
 " bez D-Channel (prenajat� linky)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Ak� typ protokolu chcete pou��va� ?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Ak� typ karty m�te?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Neviem"
 
-#: ../../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"
@@ -5136,19 +5221,19 @@ msgstr ""
 "\n"
 "Ak m�te PCMCIA kartu, mus�te vedie� irq a io adresu tejto karty.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Preru�"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Pokra�ova�"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Ktor� je va�a ISDN karta ?"
 
-#: ../../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."
@@ -5156,108 +5241,59 @@ msgstr ""
 "Na�iel som PCI ISDN kartu, ale nepozn�m tento typ. Pros�m zvo�te si jednu z "
 "PCI kariet na �al�ej obrazovke."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Nebola n�jdena ISDN karta. Pros�m zvo�te si jednu zo zobrazen�ch."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Vo va�om syst�me nebol n�jden� sie�ovy ethernet adapt�r.\n"
-"Nem��em nastavi� po�adovan� typ pripojenia."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Zvo�te sie�ove rozhranie"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Pros�m zvo�te si ktor� sie�ov� zariadenie budete pou��va� na pripojenie k "
-"internetu"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Sie�ove rozhranie"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"S�hlas�te?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Chcem re�tartova� sie�ov� rozhranie:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "Konfigur�cia ADSL"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Chcete sa pripoji� hne� pri �tarte?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Pros�m zvo�te na ktor� s�riov� port je pripojen� v� modem."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Vo�by dialupu"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Meno pripojenia"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Telef�nne ��slo"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Prihlasovacie ID"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autentifik�cia"
+#: ../../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 "Zalo�en� na skriptoch"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Zalo�en� na termin�ly"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Meno dom�ny"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Prv� DNS server (nepovinn�)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Druh� DNS server (nepovinn�)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "Chcem re�tartova� sie�ov� rozhranie  $netc->{NET_DEVICE}. M��em?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5265,7 +5301,7 @@ msgstr ""
 "\n"
 "M��ete va�e pripojenie prekonfigurova� alebo sa odpoji�."
 
-#: ../../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."
@@ -5273,11 +5309,11 @@ msgstr ""
 "\n"
 "M��ete prekonfigurova� va�e pripojenie."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Moment�lne ste pripojen� k internetu."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5285,110 +5321,67 @@ msgstr ""
 "\n"
 "M��ete prekonfigurova� va�e pripojenie, alebo sa pripojit k internetu."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Moment�lne nieste pripojen� k internetu."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Pripoji� k internetu"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Odpoji� od internetu"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Konfigur�cia sie�ov�ho pripojenia (LAN alebo internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Pripojenie a konfigur�cia internetu"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Sprievodca konfigur�ciou siete"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Extern� ISDN modem"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Intern� ISDN karta"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Ak� typ ISDN pripojenia m�te?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Pripojenie k internetu"
-
-#: ../../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 ""
-"Najpou�ivanej�ie pripojenie s adsl je pppoe.\n"
-"Av�ak existuj� pripojenia ktor� pou��vaju pptp alebo dhcp.\n"
-"Ak neviete �o pou�i�, tak zvo�te 'pou�i pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "pou�i� dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "pou�i pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "pou�i 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 "Chcem re�tartova� sie�ov� rozhranie %s. M��em?"
+msgid "We are now going to configure the %s connection."
+msgstr "Teraz nastav�me Va�e pripojenie %s."
 
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
-msgstr ""
-"Ktor� dhcp klient chcete pou�i�?\n"
-"�tandardn� je dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "Konfigur�cia siete"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Chcete re�tartova� sie�"
-
-#: ../../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 ""
-"Nastal probl�m pri re�tartovan� sie�e: \n"
 "\n"
-"%s"
+"\n"
+"\n"
+"Teraz nastav�me pripojenie %s.\n"
+"\n"
+"Stla�te OK pre pokra�ovanie."
+
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Konfigur�cia siete"
 
-#: ../../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 ""
+"Preto�e rob�te in�tal�ciu cez sie�, va�a sie� je u� nasaven�. Stla�te OK pre "
+"zachovanie\n"
+"nastavenia, alebo Cancel pre op�tovn� nastavenie pripojenia na internet a "
+"sie�.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -5400,107 +5393,132 @@ msgstr ""
 "Chcete nastavi� va�e pripojenie k sieti/internetu.\n"
 "Ak nechcete pou�i� automatick� detekciu od�krtnite pol��ko.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Zvo�te profil na konfigur�ciu"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Pou�i� auto-detekciu"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Zis�ujem zariadenia..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Norm�lne mod�move pripojenie"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "detekovan� na porte %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "ISDN pripojenie"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "n�jdene %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (alebo ADSL) pripojenie"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+msgid "ADSL connection"
+msgstr "ADSL pripojenie"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "detekovan� na rozhran� %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Pripojenie k�blom"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "detekovan� pripojenie k�blom"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "Pripojenie LAN"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "n�jden� ethernet karta(y)"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Ako sa chcete by� pripojen� k internetu?"
+#: ../../network/netconnect.pm_.c:190
+msgid "Choose the connection you want to configure"
+msgstr "Vyberte pripojenie, ktor� chcete nastavi�"
 
-#: ../../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 ""
+"Nastavili ste nieko�ko mo�nost� pripojenia k internetu.\n"
+"Zvo�te jednu, ktor� chcete pou��va�.\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 "Pripojenie k internetu"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "nena�iel som sie�ov� kartu"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Chcete sa pripoji� hne� pri �tarte?"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Konfigurujem sie�"
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "Konfigur�cia siete"
 
-#: ../../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 ""
-"Pros�m zadajte meno v�ho po��ta�a ak ho viete.\n"
-"Niektor� DHCP servre ho vy�aduj� pre svoju funk�nos�.\n"
-"Meno v�ho po��ta�a by malo byt plne kvalifikovan� host name,\n"
-"ako napr�klad ``hq.alert.sk''."
+"Nastal probl�m pri re�tartovan� sie�e: \n"
+"\n"
+"%s"
 
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "N�zov po��ta�a"
+#: ../../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 ""
+"Gratulujeme. Nastavenie siete a pripojenia k internetu je dokon�en�\n"
+"\n"
+"Nastavenie bude teraz aplikovan� na v� syst�m.\n"
+
+#: ../../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 ""
+"Po zmene doporu�ujeme re�tartovat X windows, aby ste\n"
+"predi�li probl�mom pri zmene hos�ovsk�ho mena."
 
-#: ../../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 ""
+"Varovanie: Toto zariadenie u� bolo  nastaven� na pr�stup k internetu.\n"
+"Jednoducho nechajte p�vodn� nastavenie.\n"
+"Modifik�cia parametrov m��e zmeni� nastavenie."
 
-#: ../../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"
@@ -5510,38 +5528,38 @@ msgstr ""
 "Ka�d� z�znam by mal by� zadan� ako IP adresa v dekadickom tvare\n"
 "oddelenom bodkami (napr. 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 "Konfigur�cia sie�ov�ho zariadenia %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr " (ovlada� $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (ovlada� %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 adresa"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "Maska siete"
 
-#: ../../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 "Automatick� 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 adresa mus� by� vo form�te 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"
@@ -5553,43 +5571,147 @@ msgstr ""
 "ako napr�klad ``hq.alert.sk''.\n"
 "Tie� m��ete zada� IP adresu br�ny ak ju viete"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNS server"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Br�na"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Zariadenie smeruj�ce k br�ne"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Nastavenie 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 m� by� http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Proxy m� by� ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Konfigur�cia internetu"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Chcete sa sk�si� pripoji� teraz k internetu?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Testovanie pripojenia..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Syst�m je teraz pripojen� k internetu."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Z bezpe�nostn�ch d�vodov bude teraz odpojen�."
+
+#: ../../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 ""
+"Syst�m prevdepodobne nieje pripojen� k internetu.\n"
+"Sk�ste prekonfigurova� pripojenie."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Konfigur�cia pripojenia"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Pros�m vypl�te alebo za�krtnite pol��ka"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ karty"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "DMA karty"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "IO karty"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "IO_0 karty"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "IO_1 karty"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Va�e osobn� telef�nne ��slo"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Meno poskytovate�a (napr. provider.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Telef�nne ��slo poskytovate�a"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "DNS 1 poskytovate�a (volite�n�)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "DNS 2 poskytovate�a (volite�n�)"
+
+#: ../../network/tools.pm_.c:88
+msgid "Choose your country"
+msgstr "Vyberte si va�u krajinu"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "M�d vyt��ania"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+msgid "Connection speed"
+msgstr "R�chlos� pripojenia"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+msgid "Connection timeout (in sec)"
+msgstr "Timeout pripojenia (v sekund�ch)"
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Meno ��tu (u�ivate�sk� meno)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Heslo ��tu"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Na tejto platforme njeje podporovan� roz��ren� oddiel"
 
-#: ../../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 "
@@ -5600,31 +5722,29 @@ msgstr ""
 "aby sa vo�n� miesto nach�dzalo za n�m a bolo pou�ite�n� pre roz��ren�\n"
 "oddiel."
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "chyba pri ��tan� zo s�boru %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Obnovenie zo s�boru %s zlyhalo: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Chybn� z�lohovac� s�bor"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "chyba pri z�pise do s�boru %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 ""
+"Na va�om disku sa deje nie�o nedobr�.\n"
+"Zlyhal test integrity d�t. Ak�ko�vek z�pis d�t mo�e skon�i�\n"
+"ne�spechom a stratou d�t."
 
 #: ../../pkgs.pm_.c:24
 msgid "must have"
@@ -5646,49 +5766,204 @@ msgstr "pekn�"
 msgid "maybe"
 msgstr "mo�no"
 
-#: ../../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 - Tla�, neukladaj do fronty."
+
+#: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr "USB"
+
+#: ../../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 "Lok�lna tla�iare�"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Vzdialen� tla�iare�"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
-msgstr "Vzdialen� lpd server"
+#: ../../printer.pm_.c:42
+msgid "Printer on remote CUPS server"
+msgstr "Tla�iare� na vzdialenom CUPS serveri"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:43
+msgid "Printer on remote lpd server"
+msgstr "Tla�iare� na vzdialenom lpd serveri"
+
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Sie�ov� tla�iare� (soket)"
 
-#: ../../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 "Tla�iare� na vzdialenom SMB/Windows 95/98/NT serveri"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+msgid "Printer on NetWare server"
+msgstr "Tla�iare� na vzdialenom NetWare serveri"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
-msgstr "URI tla�iarne"
+#: ../../printer.pm_.c:47
+msgid "Enter a printer device URI"
+msgstr "Vlo�te URI zariadenia tla�iarne"
+
+#: ../../printer.pm_.c:48
+msgid "Pipe job into a command"
+msgstr "Presmeruj v�stup do pr�kazu"
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr "Nezn�my 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 "(nal %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr "(na tomto stroji)"
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "Zvo�te pripojenie tla�iarne"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Ako je tla�iare� pripojen�?"
+
+#: ../../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"
+"Tla�iarne na vzdialenom CUPS serveri nemus�te konfigurova�\n"
+"lok�lne; tla�iarne bud� automaticky detekovan�. Pros�m\n"
+"zo�te \"Tla�iare� na vzdiailenom CUPS serveri\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+#, fuzzy
+msgid "None"
+msgstr "Hotovo"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Zvo�te predvolen�ho u�ivate�a:"
+
+#: ../../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 "Zatvori�"
+
+#: ../../printerdrake.pm_.c:125
+msgid "Apply/Re-read printers"
+msgstr "Aplikuj/Znovu na��taj"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printerdrake.pm_.c:129
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP adresa vyzer� napr�klad takto: 192.168.1.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+msgid "The port number should be an integer!"
+msgstr "�islo portu m� by� cel� kladn� ��slo!"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+msgid "Default printer"
+msgstr "Predvolen� tla�iare�"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "IP CUPS servera"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Automatick� kroky konfigur�cie"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Zis�ujem zariadenia..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Test portov"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Bola zisten� tla�iare�, model \"%s\" na "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Lok�lne zariadenie tla�iarne"
 
-#: ../../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"
@@ -5696,37 +5971,55 @@ msgstr ""
 "Ku ktor�mu zariadeniu je va�a tla�iare� pripojen�?\n"
 "(/dev/lp0 zodpoved� LPT1)\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Zariadenie tla�iarne"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr "Ch�ba zariadenie alebo meno s�boru."
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "Na��tavam d�ta tla�iarne ..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Vo�by vzdialenej lpd tla�iarne"
 
-#: ../../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 ""
-"Pre pou�itie vzdialenej lpd tla�ovej fronty je potrebn� zada� n�zov\n"
-"tla�ov�ho servera a n�zov fronty na tomto serveri, do ktorej maj� by�\n"
-"tla�ov� �lohy zara�ovan�."
+"Pre pou�itie vzdialenej lpd tla�ovej fronty je potrebn� \n"
+"zada� n�zov tla�ov�ho servera a n�zov tla�iarne na tomto\n"
+"serveri."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+msgid "Remote host name"
 msgstr "N�zov vzdialen�ho po��ta�a"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Vzdialen� fronta"
+#: ../../printerdrake.pm_.c:317
+msgid "Remote printer name"
+msgstr "Meno vzdialenej tla�iarne"
+
+#: ../../printerdrake.pm_.c:320
+msgid "Remote host name missing!"
+msgstr "Ch�ba n�zov vzdialen�ho po��ta�a"
+
+#: ../../printerdrake.pm_.c:324
+msgid "Remote printer name missing!"
+msgstr "Ch�ba n�zov vzdialenej tla�iarne!"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Vo�by tla�iarne 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"
@@ -5740,29 +6033,37 @@ msgstr ""
 "aj n�zov zdie�an�ho zariadenia pre tla�iare� a vhodn� meno pou��vate�a,\n"
 "heslo a pracovn� skupinu."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "N�zov SMB servra"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "IP adresa SMB servra"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "N�zov zdie�an�ho zariadenia"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Pracovn� skupina"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr "Mus�te zada� meno, alebo IP adresu servera!"
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr "Ch�ba meno samba zlo�ky!"
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "Vo�by tla�iarne pre 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."
@@ -5771,297 +6072,837 @@ msgstr ""
 "servera (neb�va v�dy zhodn� s TCP/IP n�zvom po��ta�a), ako aj n�zov fronty\n"
 "tla�iarne, ku ktorej chcete pristupova� a vhodn� meno pou��vate�a s heslom."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Tla�ov� server"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "N�zov tla�ovej fronty"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr "Ch�ba meno NCP servera!"
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr "Ch�ba meno NCP fronty!"
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Nastavenia soketu tla�iarne"
 
-#: ../../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 ""
 "Pre tla� na socket tla�iarne mus�te zada�\n"
-"meno hostite�a kde je tla�iare� a ak chcete tak aj ��slo portu."
+"meno hostite�a tla�iarne a pr�padne ��slo portu.\n"
+"Na HP JetDirect serveroch je to v��inou 9100,\n"
+"inde to m��e by� odli�n�. Pozrite si manu�l."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+msgid "Printer host name"
 msgstr "Hostite�sk� meno tla�iarne"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Port"
+#: ../../printerdrake.pm_.c:537
+msgid "Printer host name missing!"
+msgstr "Ch�ba hostite�sk� meno tla�iarne"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "URI tla�iarne"
+
+#: ../../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 ""
+"Pre pr�stup k tla�iarni zadajte jej URI. URI mus� sp��a� CUPS alebo Foomatic "
+"�pecifik�cie."
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr "Mus�te zada� spr�vne 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 ""
+"Ka�d� tla�iare� potrebuje meno (napr�klad lp).\n"
+"Popis a Poloha nie je potrebn� vypl�ova�. S� \n"
+"iba koment�rmi pre u��vate�ov."
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "M��ete priamo �pecifikova� adresu pre CUPS tla�iare�."
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Meno tla�iarne"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Popis"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Umiestnenie"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "Na��tavam d�ta tla�iarne ..."
+
+#: ../../printerdrake.pm_.c:793
+msgid "Printer model selection"
+msgstr "V�ber modelu tla�iarne"
+
+#: ../../printerdrake.pm_.c:794
+msgid "Which printer model do you have?"
+msgstr "Ak� model tla�iarne m�te?"
+
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Zmena nastavenia tla�iarne"
+
+#: ../../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 "Konfigur�cia internetu"
+
+#: ../../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 ""
+"Z�kladn� nastavenia tla�iarne\n"
+"Uistite sa, �e ve�kos� papiera a typ atramentu\n"
+"je nastaven� spr�vne. Pr�li� vysok� kvalita\n"
+"tla�e sp�sobuje spomalenie."
+
+#: ../../printerdrake.pm_.c:1090
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr "Parameter %s mus� by� cel� ��slo!"
+
+#: ../../printerdrake.pm_.c:1094
+#, c-format
+msgid "Option %s must be a number!"
+msgstr "Parameter %s mus� by� ��slo!"
+
+#: ../../printerdrake.pm_.c:1099
+#, c-format
+msgid "Option %s out of range!"
+msgstr "Parameter %s je mimo rozsahu!"
+
+#: ../../printerdrake.pm_.c:1136
+#, fuzzy, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
+msgstr "Naozaj chcete odstr�ni� tla�iate� \"%s\"?"
+
+#: ../../printerdrake.pm_.c:1152
+msgid "Test pages"
+msgstr "Testovacie str�nky"
+
+#: ../../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 ""
+"Pros�m zvo�te testovacie str�nky, ktor� chcete vytla�i�\n"
+"Tla� testovacej st�nky foto kvality m��e trva� tro�ku dlh�ie."
+
+#: ../../printerdrake.pm_.c:1158
+msgid "No test pages"
+msgstr "�iadne testovacie str�nky"
+
+#: ../../printerdrake.pm_.c:1159
+msgid "Print"
+msgstr "Tla�"
+
+#: ../../printerdrake.pm_.c:1161
+msgid "Standard test page"
+msgstr "�tandardn� testovacie str�nky"
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
-msgstr "Ak� typ tla�iarne m�te?"
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr "Alternat�vna testovacia str�nka (Letter)"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "�el�te si vysk��a� nastavenie tla�iarne?"
+#: ../../printerdrake.pm_.c:1167
+msgid "Alternative test page (A4)"
+msgstr "Alternat�vna testovacia str�nka (A4)"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1169
+msgid "Photo test page"
+msgstr "Fotografick� testovacia str�nka"
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Prebieha tla� testovacej str�nky..."
 
-#: ../../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 ""
-"Testovacia str�nka bola zaslan� tla�ov�mu d�monu.\n"
+"Testovacia str�nka bola zaslan� tla�iarni.\n"
 "K�m za�ne tla�iare� tla�i�, m��e to chv��ku trva�.\n"
 "Stav tla�e:\n"
 "%s\n"
 "\n"
-"Prebehol test spr�vne?"
 
-#: ../../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 ""
-"Testovacia str�nka bola zaslan� tla�ov�mu d�monu.\n"
+"Testovacia str�nka bola zaslan� tla�iarni.\n"
 "K�m za�ne tla�iare� tla�i�, m��e to chv��ku trva�.\n"
-"Prebehol test spr�vne?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "�no, vytla�i� ASCII testovaciu str�nku"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr "Pracuje spr�vne?"
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "�no, vytla�i� PostScript testovaciu str�nku"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Bez tla�iarne"
+
+#: ../../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:236
-msgid "Yes, print both test pages"
-msgstr "�no, vytla�i� obidve testovacie str�nky"
+#: ../../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:243
-msgid "Configure Printer"
-msgstr "Konfigur�cia tla�iarne"
+#: ../../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:273
-msgid "Printer options"
+#: ../../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 "Ukon�ujem pr�cu so sie�ou"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Vo�by tla�iarne"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Ve�kos� papiera"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+msgid "Reading printer data ..."
+msgstr "Na��tavam d�ta tla�iarne ..."
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Vysun�� str�nku na konci �lohy?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+msgid "Transfer printer configuration"
+msgstr "Prenes nastavenie tla�iarne"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Parametre Uniprint ovl�da�a"
+#: ../../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 "Parametre farebnej h�bky"
+#: ../../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 ""
+"CUPS nepodporuje tla�iarne na Novell serveroch alebo\n"
+" tla�iarne, ktor� posielaj� d�ta vo free-formed command.\n"
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "Tla�i� text ako PostScript?"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
+"PDQ podporuje iba lok�lne tla�iarne, vzdialen� LPD a\n"
+"Socket/TCP tla�iarne.\n"
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "Opravi� schod�kov� efekt?"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr "LPD a LPRng nepodporuj� IPP tla�iarne.\n"
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "Po�et str�n na v�stupn� strany"
+#: ../../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 "Prav�/�av� okraj v bodoch (1/72 palca)"
+#: ../../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 "Horn�/Doln� okraj v bodoch (1/72 palca)"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
+"\n"
+"Ozna�te tla�iare� ktor� si �el�te prenies� a stla�te \n"
+"\"Prenos\"."
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "�al�ie parametre pre GhostScript"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr "Nepren�aj tla�iarne"
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "�al�ie parametre textu"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr "Prenos"
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Obr�ten� poradie str�nok"
+#: ../../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 ""
+"Tla�iare� s menom \"%s\" u� pod %s existuje.\n"
+"Stla�te \"Prenos\" na prep�sanie.\n"
+"M��ete tie� nap�sa� nov� meno alebo presko�i�\n"
+"t�to tla�iare�."
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "�el�te si nastavi� tla�iare�?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "Meno tla�iarne m��e obsahova� iba p�smen�, ��sla a pod�iarkovn�k"
 
-#: ../../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 ""
-"Moment�lne sa tu nach�dzaj� tieto tla�ov� fronty.\n"
-"M��ete prid�va� �al�ie, alebo meni� existuj�ce."
+"Tla�iare� \"%s\" u� existuje.\n"
+"�el�te si prep�sa� nastavenie ?"
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "�tart CUPS"
+#: ../../printerdrake.pm_.c:1398
+msgid "New printer name"
+msgstr "Nov� meno tla�iarne"
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
-msgstr "Na�it�vam datab�su ovl�da�ov pre CUPS..."
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr "Pren�am %s ..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Zvo�te pripojenie tla�iarne"
+#: ../../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:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Ako je tla�iare� pripojen�?"
+#: ../../printerdrake.pm_.c:1423
+#, fuzzy
+msgid "Refreshing printer data ..."
+msgstr "Na��tavam d�ta tla�iarne ..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Zvo�te pripojenie vzdialenej tla�iarne"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+msgid "Configuration of a remote printer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Sp���am pripojenie..."
+
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Sie�ov� slu�by"
+
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Nie je nastaven� monitor"
+
+#: ../../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 ""
-"S vzdialen�m CUPS serverom nemus�te konfigurova�\n"
-"tla�iarne lok�lne; tla�iarne bud� automaticky detekovan�.\n"
-"V pripade neistoty zo�te \"Vzdiailen� CUPS server\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Konfigurujem sie�"
+
+#: ../../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 ""
-"S vzdialen�m CUPS serverom nemus�te konfigurova�\n"
-"tla�iarne lok�lne; tla�iarne bud� automaticky detekovan�\n"
-"pokia� server nieje na inej sieti; v tom pripade\n"
-"mus�te zada� IP adresu CUPS servera a mo�no aj\n"
-"��slo portu."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "IP CUPS servera"
+#: ../../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 "Restarting printing system ..."
+msgstr "Na��tavam d�ta tla�iarne ..."
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Vysok�"
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
-msgstr "�islo portu m� by� ��slo"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoidn�"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Odstr�� frontu"
+#: ../../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"
-msgstr "Meno tla�iarne m��e obsahova� iba p�smen�, ��sla a pod�iarkovn�k"
+"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
+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 ""
-"Ka�d� tla�iare� mus� ma� meno (napr�klad lp).\n"
-"Taktie� m��u by� definovan� in� parametre ako s� popis alebo umiestnenie.\n"
-"Ak� meno m� by� pou�it� pre t�to tla�iare� a\n"
-"ako je t�to tla�iare� pripojen�?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Meno tla�iarne"
+#: ../../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 "Kontrolujem in�talovan� softv�r..."
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "Popis"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr "Odstra�ujem PLRng..."
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Umiestnenie"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr "Odstra�ujem LPD..."
+
+#: ../../printerdrake.pm_.c:1727
+msgid "Select Printer Spooler"
+msgstr "Zvo�te tla�ov� frontu"
+
+#: ../../printerdrake.pm_.c:1728
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Ak� typ tla�ov�ho syst�mu chcete pou��va�?"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Konfigur�cia tla�iarne"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Vo�by tla�iarne"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "Na��tavam d�ta tla�iarne ..."
+
+#: ../../printerdrake.pm_.c:1845
+msgid "Would you like to configure printing?"
+msgstr "�el�te si nastavi� tla�iare�?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
+msgid ""
+"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 ""
+
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Norm�lny m�d"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Predvo�ba)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Tla�iare� na vzdialenom CUPS serveri"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Tla�iare� na vzdialenom CUPS serveri"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+msgid "Add printer"
+msgstr "Pridaj tla�iare�"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Otestova� konfigur�ciu?"
+
+#: ../../printerdrake.pm_.c:2003
+msgid "Modify printer configuration"
+msgstr "Zmena nastavenia tla�iarne"
+
+#: ../../printerdrake.pm_.c:2004
+#, c-format
+msgid ""
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
+msgstr ""
+"Tla�iare� %s: %s %s\n"
+"�o chcete zmeni� na tejto tla�iarni?"
+
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr "Urob to!"
+
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+msgid "Printer connection type"
+msgstr "Typ pripojenia tla�iarne"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+msgid "Printer name, description, location"
+msgstr "Meno, popis a poloha tla�iarne"
+
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr "V�robca tla�iarne, model, ovl�da�"
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr "V�robca tla�iarne, model"
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+msgid "Print test pages"
+msgstr "Tla� testovac�ch str�nok"
+
+#: ../../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 "Odstr�ni� tla�iare�"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Na��tavam d�ta tla�iarne ..."
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:2103
+#, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "Naozaj chcete odstr�ni� tla�iate� \"%s\"?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Na��tavam d�ta tla�iarne ..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "Nastavenie 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 ""
+"Vitajte v n�stroji na nastavenie proxy servera.\n"
+"\n"
+"Teraz budete m�c� nastavit pou��vanie FTP a\n"
+"HTTP proxy serverov a pr�stupov� hesl�.\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 ""
+"Pros�m vypl�e inform�cie pre HTTP proxy\n"
+"Nechajte pr�zdne ak nechcete HTTP proxy\n"
+"pou��va�. "
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr "URL"
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+msgid "port"
+msgstr "port"
+
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "URL ma za��na� 'http:'"
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "Port m� by� v ��selnom tvare"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../proxy.pm_.c:59
 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 fill in the ftp proxy informations\n"
+"Leave it blank if you don't want an ftp proxy"
 msgstr ""
-"Ka�d� tla�ov� fronta (do ktor�ch s� posielan� tla�ov� �lohy)\n"
-"potrebuje meno (�asto lp) a asociovan� spool adres�r. Ak� meno\n"
-"a adres�r bude pou�it� pre t�to frontu a ako bude pripojen� tla�iare�?"
+"Pros�m vypl�e inform�cie pre FTP proxy\n"
+"Nechajte pr�zdne ak nechcete FTP proxy\n"
+"pou��va�. "
+
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "URL ma za��na� '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 ""
+"Pros�m vlo�te prihlasovacie meno a heslo pre proxy.\n"
+"Nechajte pr�zdne ak heslo nepotrebujete. "
+
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "login"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Meno fronty"
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "heslo"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Spool adres�r"
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "heslo e�te raz"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "Pripojenie tla�iarne"
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "Hesla nes�hlasia. Sk�ste znova!"
 
-#: ../../raid.pm_.c:33
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Nem��em prida� oddiel do _naform�tovan�ho_ RAID po�a md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Nem��em zap�sa� s�bor $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Nem��em zap�sa� s�bor %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid zlyhal"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid zlyhal (mo�no nie s� nain�talovan� raidtools)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nie je dos� oddielov pre RAID �rovne %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr ""
+msgstr "Spustenie ALSA (Advanced Linux Sound Architecture) zvukov�ho syst�mu"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron, periodick� pl�nova� pr�kazov."
 
-#: ../../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."
@@ -6069,13 +6910,13 @@ msgstr ""
 "apmd sa pou��va pre monitorovanie (a z�pis pomocou syslogu) stavu bat�ri�.\n"
 "M��ete ho tie� pou�i� na vypnutie po��ta�a ke� sa baterky takmer min�."
 
-#: ../../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 "Sp���a pr�kazy nastaven� cez pr�kaz at v stanovenom �ase."
 
-#: ../../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 "
@@ -6085,7 +6926,7 @@ msgstr ""
 "cron je �tandardn� UNIXov� program, ktor� sp���a pr�kazy napl�novan�\n"
 "u��vate�om. vixie cron prid�va viac mo�nost� konfigur�cie."
 
-#: ../../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 "
@@ -6096,13 +6937,15 @@ msgstr ""
 "Midnight Commander. Takisto umo�n� v textov�ch konzol�ch kop�rovanie\n"
 "pomocou my�i a podporu pop-up menu."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
+"HardDrake vyh�ad�va nov� harv�r a nastavuje parametre\n"
+"nov�ho alebo zmenen�ho hardv�ru."
 
-#: ../../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."
@@ -6110,7 +6953,7 @@ msgstr ""
 "Apache je WWW server. Je pou��van� na poskytovanie HTML str�nok a\n"
 "CGI skriptov."
 
-#: ../../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 "
@@ -6124,13 +6967,15 @@ msgstr ""
 "ako telnet, ftp, rsh, rlogin a in�. Vypnut�m inetd vypnete v�etky\n"
 "slu�by, za ktor� je zodpovedn�."
 
-#: ../../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 ""
+"Spust� filtrovanie paketov pre Linux kernel verzie 2.2 na \n"
+"ochranu v�ho po��ta�a pred �tokmi zo siete."
 
-#: ../../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"
@@ -6140,36 +6985,40 @@ msgstr ""
 "/etc/sysconfig/keyboard. Nastavenie sa d� meni� napr�klad pomocou\n"
 "konfigura�n�ho n�stroja 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 ""
+"Automatick� obnova hlavi�iek jadra v /boot\n"
+"pre /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 "Automatick� detekcia a konfigur�cia hardv�ru pri �tarte."
 
-#: ../../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 niekedy nastav� vykonanie r�znych �loh po�as\n"
+"zav�dzania syst�mu pre udr�anie konfigur�cie."
 
-#: ../../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 je tla�ov� d�mon, ktor� je po�adovan� pre spr�vnu pr�cu n�stroja lpr."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:47
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
-msgstr ""
+msgstr "Linux Virtual Server sa pou��va na vysoko v�konn� a HA rie�enia."
 
-#: ../../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."
@@ -6177,7 +7026,7 @@ msgstr ""
 "named (BIND) je dom�nov� menn� server (Domain Name Server (DNS)) pou��van�\n"
 "na preklad z mena po��ta�a na IP adresu."
 
-#: ../../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."
@@ -6185,7 +7034,7 @@ msgstr ""
 "Prip�ja a odp�ja v�etky NFS, SMB (Windows) a NCP (NetWare)\n"
 "body pripojenia."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6193,7 +7042,7 @@ msgstr ""
 "Aktivuje/Deaktivuje v�etky sie�ov� zariadenia konfigurovan� pre spustenie\n"
 "po zaveden� syst�mu."
 
-#: ../../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"
@@ -6203,7 +7052,7 @@ msgstr ""
 "T�to slu�ba dovol� NFS servru exportova� adres�re predvolen� v s�bore\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."
@@ -6211,17 +7060,19 @@ msgstr ""
 "NFS je zn�my protokol, ur�en� na zdielanie s�borov cez TCP/IP siete.\n"
 "T�to slu�ba prid� NFS servru funkciu lockovania s�borov."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
+"Automaticky zapne num-lock pod konzolou a XFree pocas\n"
+"�tartu syst�mu."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr ""
+msgstr "Podpora pre OKI 4w a kompatibiln� win tla�iarne."
 
-#: ../../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 "
@@ -6231,7 +7082,7 @@ msgstr ""
 "Podpora PCMCIA je v��inou pou��van� na spr�stupnenie sie�ovej karty,\n"
 "alebo modemu v notebookoch."
 
-#: ../../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 "
@@ -6242,7 +7093,7 @@ msgstr ""
 "NFS a NIS. Portmap server mus� by� spusten� na po��ta�och, ktor� s� \n"
 "servrami pre protokoly pou��vaj�ce RPC mechanizmus."
 
-#: ../../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."
@@ -6250,7 +7101,7 @@ msgstr ""
 "Postfix je Mail Transport Agent, �i�e program, ktor� pren�a e-maily\n"
 "z po��ta�a na po��ta�"
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -6258,13 +7109,15 @@ msgstr ""
 "Uklad� a obnovuje system entropy pool pre vy��iu kvalitu gener�tora\n"
 "n�hodn�ch ��sel."
 
-#: ../../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 ""
+"Prirad� z�kladn� zariadenie k blokov�mu (ako napr�klad oddiely\n"
+"pevn�ho disku) pre pou�itie v aplik�ci�ch ako 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"
@@ -6274,7 +7127,7 @@ msgstr ""
 "cez RIP protokol. RIP je �astej�ie pou��van� na mal�ch sietiach. Pre\n"
 "komplexnej�ie siete je potrebn� komplexn� smerovac� protokol."
 
-#: ../../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."
@@ -6282,7 +7135,7 @@ msgstr ""
 "Rstat protokol umo��uje u��vate�om z�skava� cez sie�\n"
 "inform�cie o za�a�en� ak�hoko�vek po��ta�a na sieti."
 
-#: ../../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."
@@ -6290,7 +7143,7 @@ msgstr ""
 "Rusers protokol umo��uje zisti� u��vate�om cez sie�, kto je\n"
 "prihl�sen� na odpovedaj�cich po��ta�och."
 
-#: ../../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)."
@@ -6298,12 +7151,11 @@ msgstr ""
 "Rwho protokol za�le vzdialen�m u��vate�om zoznam v�etk�ch u��vate�ov\n"
 "prihl�sen� na syst�me, na ktorom je spusten� rwho d�mon (podobne ako finger)."
 
-#: ../../services.pm_.c:85
-#, fuzzy
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
-msgstr "Spusti� X-Window syst�m pri �tarte"
+msgstr "Spusti� zvukov� syst�m na Va�om po��ta�i"
 
-#: ../../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."
@@ -6311,32 +7163,68 @@ msgstr ""
 "Syslog je mo�nos�, ktor� vyu��va mnoho d�monov na ukladanie spr�v\n"
 "do r�znych syst�mov�ch log s�borov. Je dobr�, ke� je syslog v�dy spusten�."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
-msgstr ""
+msgstr "Nahratie ovl�da�ov pre va�e usb zariadenia."
 
-#: ../../services.pm_.c:89
-#, fuzzy
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Sp���a a ukon�uje X Font Server pri �tarte a ukon�en� syst�mu."
+msgstr "Sp���a X Font Server (je potrebn� pre spustenie 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 "Zvo�te si slu�by, ktor� bud� spusten� automaticky po �tarte syst�mu"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "Tla�"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "M�d syst�mu"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Vo�by vzdialenej lpd tla�iarne"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Dtab�zy"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+msgid "Services"
+msgstr "Slu�by"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "be��"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "stopnut�"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Slu�by a d�moni"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -6344,11 +7232,16 @@ msgstr ""
 "�iadne roz�iruj�ce inform�cie\n"
 "o tejto slu�be, prep��te."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "Pri �tarte"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "In�talujem bal�k %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"
@@ -6356,15 +7249,77 @@ msgstr ""
 "Nedok�em pre��ta� tabu�ku rozdelenia disku, je pr�li� po�koden�\n"
 "Sk�sim odstr�ni� chybn� oddiely"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+msgid "Error!"
+msgstr "Chyba!"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr "Nem��em n�jst potrebn� image file `%s'."
+
+#: ../../standalone/drakautoinst_.c:47
+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 ""
+"Teraz m��ete nastavi� Autoin�tala�n� disketu. T�to mo�nos� je �iasto�ne "
+"nebezpe�n� a preto ju pou��vajte opatrne\n"
+"\n"
+"Budete m�c� zopakova� in�tal�ciu, ktor� ste spravili na tento po��ta�, s "
+"neko�k�mi interakt�vnymi krokmi (aby ste mohli zmeni� ich hodnoty)\n"
+"\n"
+"Pre maxim�lnu bezpe�nos�, rozdelenie disku a form�tovanie sa nikdy nebude "
+"robi� automaticky.\n"
+"\n"
+"�el�te si pokra�ova�?"
+
+#: ../../standalone/drakautoinst_.c:70
+msgid "Automatic Steps Configuration"
+msgstr "Automatick� kroky konfigur�cie"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+"Pros�m pre ka�d� krok zvo�te �i sa m� zopakova� ako pri va�ej in�tal�cii "
+"alebo znovu nastavi�"
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "Gratulujeme!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+"Disketa bola �spe�ne vytvoren�.\n"
+"Teraz m��ete zopakova� in�tal�ciu."
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "Zdie�anie pripojenia k internetu"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Zdie�anie internetov�ho pripojenia je moment�lne povolen�"
 
-#: ../../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"
@@ -6376,31 +7331,31 @@ msgstr ""
 "\n"
 "�o chcete urobi�?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "zak�za�"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "odmietnu�"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "prekonfigurova�"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Zakazujem servre..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Zdie�anie internetov�ho pripojenia je teraz zak�zane."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Zdie�anie internetov�ho pripojenia je moment�lne zak�zane"
 
-#: ../../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"
@@ -6412,27 +7367,19 @@ msgstr ""
 "\n"
 "�o chcete urobi�?\""
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "povoli�"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "Povo�ujem servre..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Zdie�anie internetov�ho pripojenia je teraz povolen�."
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Nem��em interpretova� obsah konfigura�n�ho s�boru."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Nespr�vny konfigura�n� s�bor"
-
-#: ../../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 "
@@ -6441,22 +7388,27 @@ msgid ""
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
 "(LAN)."
 msgstr ""
+"M�te mo�nos� nastavi� zdielanie pripojenia na internet. S touto funkciou\n"
+"bud� m�c� ostatn� po��ta�e vo va�ej lok�lnej sieti pou��va� pripojenie na "
+"internet v�ho po��ta�a.\n"
+"\n"
+"Pozn�mka: Potrebujete samostatn� sie�ov� kartu na pripojenie lok�lnej siete."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Rozhranie %s (pou��va modul %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
 msgstr "Rozhranie %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Vo va�om syst�me nieje sie�ovy adapt�r!"
 
-#: ../../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."
@@ -6465,6 +7417,10 @@ msgstr ""
 "konfigur�ciu hardweru."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Sie�ove rozhranie"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -6479,7 +7435,7 @@ msgstr ""
 "\n"
 "Lok�lna sie� bude nastaven� pr�ve s t�mto adapt�rom."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -6487,20 +7443,21 @@ msgstr ""
 "Pros�m vyberte si sie�ovy adapt�r, ktor� bude pripojen� k va�ej lok�lnej "
 "sieti."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr "Pozor, sie�ov� adapt�r u� je nastaven�. Teraz ho prekonfigurujem."
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "Potenci�lny konflik LAN adries v aktu�lnej konfigur�cii $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "Potenci�lny konflik LAN adries v aktu�lnej konfigur�cii %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Bola n�jden� kofigur�cia firewalu!"
 
-#: ../../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."
@@ -6508,46 +7465,46 @@ msgstr ""
 "Pozor! Bola n�jden� existuj�ca konfigur�cia firewallu. Mo�no budete musiet "
 "urobi� zop�r ru�nych z�sahov po in�tal�cii."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Konfigur�cia..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Konfigur�cia skriptov, in�talovanie programov, �tart serverov..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Probl�my pri in�tal�cii bal��ka $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Gratulujeme!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Probl�my pri in�tal�cii bal��ka %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 ""
+"V�etko bolo nastaven�.\n"
+"Teraz m��ete zdie�a� va�e pripojenie na internet s ostatn�mi po��ta�mi na "
+"va�ej lok�lnej sieti pou�it�m automatick�honastavenia siete (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "Nastavenie u� bolo uroben� a je moment�lne zak�zan�."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "Nastavenie u� bolo uroben� a je moment�lne povolen�."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Zdie�anie internetov�ho pripojenia e�te nebolo nastaven�."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Konfigur�cia zdia�ania pripojenia k internetu"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -6562,205 +7519,203 @@ msgstr ""
 "\n"
 "Kliknite na Nastavi� ak chcete spusti� sprievodcu nastaven�m."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Konfigur�cia siete (%d rozhran�)"
 
-#: ../../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 "Zma� profil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Zmena profilu:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Nov� profil..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Meno vytv�raneho profilu:"
+#: ../../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 "Meno po��ta�a: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Pr�stup k internetu"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Br�na:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "Rozhranie:"
 
-#: ../../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 "Pripojen�."
 
-#: ../../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 "Nepripojen�"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Pripojenie..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Odpojenie..."
 
-#: ../../standalone/draknet_.c:191
-#, fuzzy
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
-msgstr "Testovanie pripojenia..."
+msgstr "Sp���am pripojenie..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "Ukon�ujem va�e pripojenie..."
 
-#: ../../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 ""
+"Spojenie nieje ukon�en�.\n"
+"Sk�ste ukon�i� manu�lne spusten�m\n"
+"/etc/sysconfig/network-scripts/net_cnx_down\n"
+"ako root."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "Syst�m je teraz pripojen� odpojen�."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Konfigur�cia pr�stupu k internetu..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "Konfigur�cia LAN"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adapt�r"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Ovl�da�"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Rozhranie"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+msgid "State"
+msgstr "Status"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Konfigur�cia lok�lnej siete..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Norm�lny m�d"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Aplikova�"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Pros�m �akajte... Aplikujem konfigur�ciu"
 
-#: ../../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 ""
+"Nem�te nastaven� �iadne rozhranie.\n"
+"Nastavte ho kliknut�m na Konfiguruj"
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "Konfigur�cia LAN"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapt�r %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "�tartovac� protokol"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Spusten� pri �tarte"
 
-#: ../../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 "Zak�za�"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+msgid "activate now"
+msgstr "aktivuj teraz"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Povoli�"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+msgid "desactivate now"
+msgstr "deaktivuj teraz"
 
-#: ../../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 ""
+"Nem�te nastaven� pripojenie na internet.\n"
+"Vytvorte ho zakliknut�m tla��tka konfiguruj"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Konfigur�cia pripojenia internetu"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Konfigur�cia pripojenia internetu"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Typ pripojenia: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parametre"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "DNS 1 poskytovate�a (volite�n�)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "DNS 2 poskytovate�a (volite�n�)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Ethernet karta"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP klient"
 
@@ -6825,15 +7780,30 @@ msgstr ""
 "M�me v�etky v�hody �rovne 4, ale syst�m je �plne uzavret�.\n"
 "Bezpe�nos� je jednoducho na najvy��ej mo�nej �rovni."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Nastavujem �rove� bezpe�nosti"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Zvo�te parametre servra"
+
+#: ../../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 "Nastavujem �rove� bezpe�nosti"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Kontroln� centrum"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Vyberte n�stroj, ktor� chcete pou�i�"
 
@@ -6861,83 +7831,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Nem��em spusti� priamu aktualiz�ciu !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "nebolo n�jden� serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Emulova� 3 tla��tka?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Pros�m otestujte my�."
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "Monitorovanie sie�e"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "�tatistika"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "R�chlos� posielania: "
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "R�chlos� pr�jmania: "
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Zatvori�"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "Pripojenie k internetu "
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "Odpojenie od internetu "
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "Odpojenie od internetu bolo ne�spe�ne."
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "Odpojenie od internetu je ukon�en�."
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Pripojenie je kompletn�."
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"Pripojenie ne�spe�n�.\n"
-"Overte si nastavenia v Kontrolnom centre Mandrake."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "poslan�: "
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "prijat�: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Pripoji�"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Odpoji�"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Konfigur�cia firewalu"
@@ -6968,16 +7869,88 @@ msgstr ""
 "\n"
 "Kliknite na Nastavi� ak chcete nastavi� �tandardn� firewall"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Vo�ba jazyka"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Vo�ba triedy in�tal�cie"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Detekcia pevn�ho disku"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Konfigur�cia my�i"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "V�ber kl�vesnice"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Bezpe�nos�"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "S�borov� syst�my"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Form�tovanie oddielov"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "V�ber bal�kov"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "In�tal�cia syst�mu"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Vytv�ranie u��vate�ov"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Sie�ov� slu�by"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Nastavenie slu�ieb"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Zav�dzacia disketa"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "In�tal�cia zav�dza�a"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Konfigur�cia X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Koniec in�tal�cie"
+
+#: ../../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 konfigur�tor\n"
+"\n"
+"Nastavuje osobn� firewall pre v� Linux Mandrake syst�m na tomto\n"
+"po��ta�i. "
 
-#: ../../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"
@@ -6987,24 +7960,37 @@ msgid ""
 "it off.  You can change this configuration anytime you like by\n"
 "re-running this application!"
 msgstr ""
+"Teraz nieko�ko ot�zok o tom, na ktor� slu�by chcete dovoli� pr�stup\n"
+"z internetu. Pros�m zva�ujte �i potrebujete jednotliv� slu�by preto�e\n"
+"bezpe�nos� v�ho po��ta�a je d�le�it�.\n"
+"\n"
+"Ak nepou��vate tieto slu�by, je lep�ie zabr�ni� pr�stupu z internetu.\n"
+"Nastavenie m��ete zmeni� jednoducho op�tovn�m spusten�m\n"
+"tejto aplik�cie."
 
-#: ../../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 ""
+"Chcete aby bol v� www server dostupn� z internetu ? Ak v�m sta��\n"
+"dostupnos� iba z lok�lneho servera, m��ete odpoveda� Nie.\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 ""
+"Pou��vate na va�om po��ta�i menn� server ? Ak sa o va�e DNS z�znamy\n"
+"star� napr�klad v� poskytovate� internetu, odpovedzte pros�m nie. \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"
@@ -7012,48 +7998,69 @@ 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 ""
+"Chcete dovoli� pr�chodzie Secure Shell (ssh) pripojenia ? Ssh je n�hrada\n"
+"za telnet, ktor� m��ete pou�i� na prihl�senie sa k vzdialen�mu serveru.\n"
+"Telnet nepou��va k�dovanie. To znamen�, �e �to�n�k m��e ukradn�� \n"
+"va�e heslo. Ssh k�dovanie pou��va, tak�e kr�de� v�ho hesla nehroz�."
 
-#: ../../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 ""
+"Chcete dovoli� pripojenia cez telnet ? Toto je ve�mi nebezpe�n�.\n"
+"Silne doporu�ujeme Tu odpoveda� NIE a pou�i� ssh ako n�hradu \n"
+"za 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 ""
+"Chcete pou��va� FTP server dosiahnute�n� cez internet ? Ak �no, ve�mi \n"
+"doporu�ujeme aby ste pou��vali iba anonymn� prenosy. Ak�ko�vek heslo\n"
+"zaslan� FTP serveru m��e by� ukradnut�, preto�e FTP pri prenose hesiel\n"
+"nepou��va k�dovanie.\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 ""
+"M�te spusten� mail server ? Ak pou��vate textov� e-mail\n"
+"klieny ako pine, alebo mutt, tak asi m�te. V opa�nom pr�pade\n"
+"by ste t�to slu�bu mali vypn��.\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 ""
+"M�te spusten� POP alebo IMAP slu�by? Tieto m��u by�\n"
+"pou�it� pre pr�stup k e-mailov�m schr�nkam u��vate�ov.\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 ""
+"Vyzer� to, �e  m�te kernel verzie 2.2.x. Ak je va�a IP adresa\n"
+"automaticky nastavovan� pri zmene prostredia (domov, praca)\n"
+"potrebujete dovoli� t�to mo�nos�. Je to tento pr�pad ?\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"
@@ -7061,8 +8068,13 @@ msgid ""
 "of a larger office and haven't heard of this, you probably \n"
 "aren't."
 msgstr ""
+"M� v� po��ta� synchronizovan� �as vo�i in�mu po��ta�u?\n"
+"V��inou sa t�to slu�ba pou��va v stredne ve�k�ch organiz�ci�ch\n"
+"k�li jednotn�mu �asu v logoch a podobne. Ak nie ste s��as�\n"
+"nie�oho v��ieho a e�te ste o takejto slu�be nepo�uli, \n"
+"pravdepodobne to nebudete potrebova�."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -7074,305 +8086,431 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Nem��em otvori� %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Nem��em otvori� %s pre z�pis: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klienty pre r�zne protokoly vr�tane ssh"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "V�voj�rska"
+msgid "Network Computer (client)"
+msgstr "Sie�ovy po��ta� (klient)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Pracovn� stanica"
+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 "Firewall/Router"
+msgid "Office"
+msgstr "Kancel�ria"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Osobn� informa�n� mana�ment"
+msgid "Gnome Workstation"
+msgstr "Gnome stanica"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multim�dia - Grafika"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "N�stroje pre v� Palm Pilot alebo Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Workstation"
+msgstr "Pracovn� stanica"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Sie�ovy po��ta� (klient)"
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+#: ../../share/compssUsers:999
+msgid "Domain Name and Network Information Server"
+msgstr "Domain Name a Network Information Server"
+
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kancel�rske programy: editory (kword, abiword), tabu�kov� procesory "
+"(kspread, gnumeric), pdf prehliada�e, atd"
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr "N�stroje pre audio: mp� alebo midi prehr�va�e, etc"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internetov� stanica"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knihy a n�vody pre Linux a Free Software"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kancel�ria"
+msgid "KDE Workstation"
+msgstr "KDE stanica"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedialna stanica"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, at�"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"N�stroje na ��tanie a posielanie mailov a spr�v (pine, mutt, tin..) a "
-"prehliadanie www"
+msgid "Multimedia - Video"
+msgstr "Multim�dia - Video"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C a C++ v�vojove kni�nice, programy a include s�bory"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "N�stroje na mail, spr�vy, web, prenos s�borov, a chat"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr ""
+msgid "Database"
+msgstr "Dtab�zy"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programy na spr�vu va��ch financi�, napr. gnucash"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL alebo MySQL datab�zov� server"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "Tools to ease the configuration of your computer"
+msgstr "N�stroje na jednoduch� konfigur�ciu v�ho po��ta�a"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, SSH server"
+msgid "Multimedia - Sound"
+msgstr "Multim�dia - Zvuk"
+
+#: ../../share/compssUsers:999
+msgid "Utilities"
+msgstr "Pom�cky"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "Dokument�cia"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, at�"
+msgid "Console Tools"
+msgstr "Konzolov� n�stroje"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Pom�cky"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix mail server, Inn news server"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Internet station"
+msgstr "Internetov� stanica"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafick� prostredie"
+msgid "Multimedia station"
+msgstr "Multimedialna stanica"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multim�dia - Zvuk"
+#, fuzzy
+msgid "Configuration"
+msgstr "Konfigur�cia LAN"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Z�bavne programy: stolov�, strat�gie, at�"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Viac grafick�ch prostred� (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Prehrava�e a editory videa"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Enviroment, grafick� prostredie s mno�stvom pribalen�ch programov"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konzolov� n�stroje"
+msgid "Graphical Environment"
+msgstr "Grafick� prostredie"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programy na prehr�vanie/editovanie zvuku a videa"
+msgid "Development"
+msgstr "V�voj�rska"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Vedeck� stanica"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache a Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editory, shelly, s�borove n�stroje, termin�ly"
+msgid "Tools to create and burn CD's"
+msgstr "N�stroje na vytvorenie a nap�lenie CD"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knihy a n�vody pre Linux a Free Software"
+msgid "Office Workstation"
+msgstr "Kancel�rska stanica"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "Grafick� rozhranie s aplik�ciami a desktopov�mi n�strojmi"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, at�"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafick� programy ako napr. The Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Hry"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multim�dia - Video"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C a C++ v�vojove kni�nice, programy a include s�bory"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
 msgstr "Sie�ov� server"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafick� programy ako napr. The Gimp"
+msgid "Mail/Groupware/News"
+msgstr "Mail/Groupware/Spr�vy"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kancel�rska stanica"
+msgid "Game station"
+msgstr "Hracia stanica"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop Enviroment, grafick� prostredie s mno�stvom pribalen�ch programov"
+msgid "Video players and editors"
+msgstr "Prehrava�e a editory videa"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Viac grafick�ch prostred� (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multim�dia - Grafika"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "N�stroje na vytvorenie a nap�lenie CD"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Z�bavne programy: stolov�, strat�gie, at�"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multim�dia - CD napa�ovanie"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"N�stroje na ��tanie a posielanie mailov a spr�v (pine, mutt, tin..) a "
+"prehliadanie www"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
 msgstr "Archiv�cia, emul�tory, monitorovanie"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Dtab�zy"
+msgid "Personal Finance"
+msgstr "Osobn� financie"
 
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Kancel�rske programy: editory (kword, abiword), tabu�kov� procesory "
-"(kspread, gnumeric), pdf prehliada�e, atd"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Grafick� rozhranie s aplik�ciami a desktopov�mi n�strojmi"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr "Klienty pre r�zne protokoly vr�tane ssh"
 
 #: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Server"
+msgid "Internet gateway"
+msgstr "Br�na k internetu"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Osobn� financie"
+msgid "Sound and video playing/editing programs"
+msgstr "Programy na prehr�vanie/editovanie zvuku a videa"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfigur�cia"
+msgid "Other Graphical Desktops"
+msgstr "In� grafick� prostredia"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE stanica"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editory, shelly, s�borove n�stroje, termin�ly"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "In� grafick� prostredia"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programy na spr�vu va��ch financi�, napr. gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache a Pro-ftpd"
+msgid "Games"
+msgstr "Hry"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Mail/Groupware/Spr�vy"
+msgid "Personal Information Management"
+msgstr "Osobn� informa�n� mana�ment"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome stanica"
+msgid "Multimedia - CD Burning"
+msgstr "Multim�dia - CD napa�ovanie"
 
 #: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+msgstr "Vedeck� stanica"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "nem��em otvori� /etc/sysconfig/autologin na ��tanie: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Chcete re�tartova� sie�"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "S�hlas�te?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Chcem re�tartova� sie�ov� rozhranie:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Chcem re�tartova� sie�ov� rozhranie %s. M��em?"
+
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Moment�lne s� nastaven� tieto tla�iarne.\n"
+#~ "M��ete prid�va� �al�ie, alebo meni� existuj�ce."
+
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Timeout pripojenia (v sekund�ch) (beta, e�te nieje implementovan�)"
+
 #, fuzzy
-msgid "Internet gateway"
-msgstr "Pr�stup k internetu"
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Zvo�te predvolen�ho u�ivate�a:"
 
-#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "N�stroje pre v� Palm Pilot alebo Visor"
+#~ msgid "Spooler: "
+#~ msgstr "Spooler:"
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Hracia stanica"
+#~ msgid "Test the mouse here."
+#~ msgstr "Pros�m otestujte si my�."
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, at�"
+#~ msgid "Press next to continue."
+#~ msgstr "Stla�te next pre pokra�ovanie"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "N�stroje na jednoduch� konfigur�ciu v�ho po��ta�a"
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (alebo ADSL) pripojenie"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "N�stroje na mail, spr�vy, web, prenos s�borov, a chat"
+#~ msgid "Choose"
+#~ msgstr "Zvo�te"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "M��ete priamo �pecifikova� adresu pre CUPS tla�iare�."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "�no, vytla�i� ASCII testovaciu str�nku"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "�no, vytla�i� PostScript testovaciu str�nku"
+
+#~ msgid "Yes, print both test pages"
+#~ msgstr "�no, vytla�i� obidve testovacie str�nky"
+
+#~ msgid "Paper Size"
+#~ msgstr "Ve�kos� papiera"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Vysun�� str�nku na konci �lohy?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Parametre Uniprint ovl�da�a"
+
+#~ msgid "Color depth options"
+#~ msgstr "Parametre farebnej h�bky"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Tla�i� text ako PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Opravi� schod�kov� efekt?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Po�et str�n na v�stupn� strany"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Prav�/�av� okraj v bodoch (1/72 palca)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Horn�/Doln� okraj v bodoch (1/72 palca)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "�al�ie parametre pre GhostScript"
+
+#~ msgid "Extra Text options"
+#~ msgstr "�al�ie parametre textu"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Obr�ten� poradie str�nok"
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ msgid "CUPS starting"
+#~ msgstr "�tart CUPS"
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ msgid "Reading CUPS drivers database..."
+#~ msgstr "Na�it�vam datab�su ovl�da�ov pre CUPS..."
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Zvo�te pripojenie vzdialenej tla�iarne"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d min�t"
+#~ 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 ""
+#~ "S vzdialen�m CUPS serverom nemus�te konfigurova�\n"
+#~ "tla�iarne lok�lne; tla�iarne bud� automaticky detekovan�.\n"
+#~ "V pripade neistoty zo�te \"Vzdiailen� CUPS server\"."
 
-#~ msgid "1 minute"
-#~ msgstr "1 min�ta"
+#~ 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 ""
+#~ "Ka�d� tla�iare� mus� ma� meno (napr�klad lp).\n"
+#~ "Taktie� m��u by� definovan� in� parametre ako s� popis alebo "
+#~ "umiestnenie.\n"
+#~ "Ak� meno m� by� pou�it� pre t�to tla�iare� a\n"
+#~ "ako je t�to tla�iare� pripojen�?"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sek�nd"
+#~ 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 ""
+#~ "Ka�d� tla�ov� fronta (do ktor�ch s� posielan� tla�ov� �lohy)\n"
+#~ "potrebuje meno (�asto lp) a asociovan� spool adres�r. Ak� meno\n"
+#~ "a adres�r bude pou�it� pre t�to frontu a ako bude pripojen� tla�iare�?"
 
-#~ msgid "Configuration de Lilo/Grub"
-#~ msgstr "Konfigur�cia Lilo/Grub"
+#~ msgid "Name of queue"
+#~ msgstr "Meno fronty"
 
-#~ msgid "Selected size %d%s"
-#~ msgstr "Zvolen� ve�kos� %d%s"
+#~ msgid "Spool directory"
+#~ msgstr "Spool adres�r"
 
-#~ msgid "This startup script try to load your modules for your usb mouse."
-#~ msgstr "Tento �tartovac� skript sa pok�si nahra� moduly pre va�u USB my�."
+#~ msgid "Light configuration"
+#~ msgstr "Jednoduch� konfigur�cia"
 
-#~ msgid "Opening your connection..."
-#~ msgstr "Otv�ram va�e pripojenie..."
+#~ msgid "Provider dns 1"
+#~ msgstr "DNS 1 poskytovate�a"
 
-#~ msgid "Configure..."
-#~ msgstr "Konfigur�cia..."
+#~ msgid "Provider dns 2"
+#~ msgstr "DNS 2 poskytovate�a"
 
-#~ msgid "cannot fork: "
-#~ msgstr "nem��em forknu�: "
+#~ msgid "fsck failed: "
+#~ msgstr "fsck zl�halo: "
 
-#~ msgid "Standard tools"
-#~ msgstr "�tandardn� n�stroje"
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Pre v��iu bezpe�nos� v�ho syst�mu by ste mali zvoli� \"Pou�i shadow\"\n"
+#~ "a \"Pou�i MD5 hesl�\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Ak va�a sie� pou��va NIS, nastavte \"Pou�i NIS\". Ak ste si nie ist�, \n"
+#~ "sp�tajte sa v�ho sie�ov�ho spr�vcu."
+
+#~ msgid "yellow pages"
+#~ msgstr "�lt� str�nky"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index ba01b013e..29374689a 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 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: 2001-08-12 13:12GMT+1\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: SERBIAN <office@mandrake.co.yu>\n"
@@ -6844,7 +6844,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/sr.po b/perl-install/share/po/sr.po
index 210a4931b..8b7126d7f 100644
--- a/perl-install/share/po/sr.po
+++ b/perl-install/share/po/sr.po
@@ -7,32 +7,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: 2001-03-20 07:46+0200\n"
-"Last-Translator: Jankovic Tomislav_<tomaja@net.yu>\n"
-"Language-Team: Serbian (latin)\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-08-12 13:12GMT+1\n"
+"Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
+"Language-Team: SERBIAN <office@mandrake.co.yu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.8\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
 msgstr "Podesi sve glave nezavisno"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Koristi Xinerama ekstenziju"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "Podesi samo karticu \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Multi-head konfiguracija"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -40,33 +41,33 @@ msgstr ""
 "Va� sistem podr�ava multiple head konfiguraciju.\n"
 "Da li to �elte da uradite?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Grafi�ka kartica"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "Izaberite karticu"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "Izaberite 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 "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
 msgstr "Koju XFree konfiguraciju �elite da imate ?"
 
-#: ../../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 ""
 "Va�a kartica mo�e imati 3D hardversku akceleraciju ali samo sa XFree %s.\n"
 "Va�u karticu podr�ava XFree %s koji mo�e imati bolju podr�ku i za 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 "Va�a kartica mo�e imati 3D hardversku akceleraciju sa 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 sa 3D hardverskom akceleracijom"
 
-#: ../../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 +97,12 @@ msgstr ""
 "ZAPAMTITE da je ovo EKSPERIMENTALNA podr�ka za 3D i mo�e dovesti do "
 "blokiranja ra�unara."
 
-#: ../../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 sa EKSPERIMENTALNOM 3D hardverskom akceleracijom"
 
-#: ../../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 ""
 "blokiranja ra�unara.\n"
 "Va�u karticu podr�ava XFree %s koji mo�e imati bolju podr�ku i za 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr "Xpmac (Instalacija displej drajver)"
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFree konfiguracija"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "Koli�ina memorije na grafi�koj kartici"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "Opcije za server"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "Izaberite 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"
@@ -152,40 +158,40 @@ msgstr ""
 "VEOMA JE VA�NO da ne navedete tip monitora koji ima ovaj opseg ve�i nego\n"
 "�to ga ima va� monitor. Ako niste sigurni, odaberite manje vrednosti."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Horizontalna frekvencija"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Vertikalna frekvencija"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "Monitor nije konfigurisan"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Grafi�ka karta jo� nije konfigurisana"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "Rezolucija jo� nije izabrana"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "Da li ho�ete da testirate konfiguraciju?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Upozorenje: testiranje ove grafi�ke kartice mo�e zamrznuti va� kompjuter"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Testiranje konfiguracije"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -193,152 +199,156 @@ msgstr ""
 "\n"
 "poku�ajte sa promenom parametara"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Hm, gre�ka:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Izlaz za %d sekundi"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "Da li je ovo ispravno pode�eno?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "Hm, pojavila se gre�ka, probajte da promenite parametre"
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Rezolucija"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "Izaberite rezoluciju i broj boja pri prikazu"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafi�ka kartica: %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 "Ekspertni mod"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Prika�i sve"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Rezolucija"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tip tastature: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tip mi�a: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Mi� je postavljen na ure�aj: %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 - horizontalna frekvencija: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor - vertikalno osve�avanje: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafi�ka kartica: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, fuzzy, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Grafi�ka kartica: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Memorija na grafi�koj kartici: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Broj boja: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rezolucija: %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 drajver: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "Provera konfiguracije za X-Window sistem"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "�ta �elite da uradite?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "Promena monitora"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "Promena grafi�ke kartice"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "Promena Server opcija"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "Promena rezolucije"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Prika�i informacije"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Testiraj ponovo"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Kraj"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -351,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 "Molim, ponovo unesite %s radi aktiviranja promena"
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Molim va� izlogujte se i restartujte (Ctrl-Alt-BackSpace) ra�unar"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X okru�enje na startu"
 
-#: ../../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?"
@@ -417,215 +427,223 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB ili vi�e"
+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 ili vi�e"
+
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standardni VGA, 640x480 na 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 na 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 kompat., 1024x768 na 87 Hz sa preplitanjem (ne 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 na 87 Hz sa preplitanjem, 800x600 na 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 na 60 Hz, 640x480 na 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 bez preplitanja, 1024x768 na 60 Hz, 800x600 na 72 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:126
+#: ../../Xconfigurator_consts.pm_.c:128
 msgid "High Frequency SVGA, 1024x768 at 70 Hz"
 msgstr "Visokofrekventni SVGA, 1024x768 na 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:127
+#: ../../Xconfigurator_consts.pm_.c:129
 msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
 msgstr "Monitor koji radi sa 1280x1024 na 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:128
+#: ../../Xconfigurator_consts.pm_.c:130
 msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
 msgstr "Monitor koji radi sa 1280x1024 na 74 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:129
+#: ../../Xconfigurator_consts.pm_.c:131
 msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
 msgstr "Monitor koji radi sa 1280x1024 na 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
 msgstr "Monitor koji radi sa 1600x1200 na 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor koji radi sa 1600x1200 na 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 "Prvi sektor startne particije"
 
-#: ../../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 "Prvi sektor diska (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILO instalacija"
 
-#: ../../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 "Gde biste da instalirate starter?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
 msgstr "LILO/grub instalacija"
 
-#: ../../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 sa tekstualnim menijem"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO sa grafi�kim menijem"
 
-#: ../../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 "Startanje iz DOS/Windows-a (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 "Glavne opcije startera"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Starter koji �e se koristiti"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "Instalacija startera"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
 msgstr "Startni (boot) ure�aj"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (ne radi na starim BIOS-ima)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Kompakt"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "kompakt"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Video mod"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
 msgstr "Pauza pre startanja default image-a"
 
-#: ../../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 "Lozinka"
 
-#: ../../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 "Lozinka (ponovite)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Ograni�ena komandna linika - opcije"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "ograni�eno"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "O�isti /tmp pri svakom startanju"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Defini�i veli�inu RAM ako je potrebno (detektovano je %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Omogu�i multi-profile"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Prika�i veli�inu RAM-a u Mb"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Opcija``Ograni�ena komandna linika - opcije'' je neupotrebljiva bez lozinke"
 
-#: ../../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 "Probajte ponovo"
 
-#: ../../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 "Nepodudarnost lozinki"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Inicijalna poruka"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Otpo�ni Firmware pauzu"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Pauza pri startanju kernela"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Omogu�i startanje sa CD-a?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Omogu�i OF startanje?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Podrazumevani 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."
@@ -633,146 +651,144 @@ msgstr ""
 "Ovo su postavljne opcije.\n"
 "Mo�ete dodati nove ili izmeniti stare."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../../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 "Ura�eno"
 
-#: ../../any.pm_.c:220
-#, fuzzy
+#: ../../any.pm_.c:217
 msgid "Modify"
-msgstr "Promeni RAID"
+msgstr "Promeni"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "Koju vrstu unosa dodajete ?"
 
-#: ../../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 "Drugi OS-ovi (SunOS,BSD,...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Drugi OS-ovi (MacOS,BSD,...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "Drugi OS-ovi (Windows,BSD,BeOS,...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Slika"
 
-#: ../../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 "Dodatak"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "�itanje-pisanje RW"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tabela"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Nesigurno"
 
-#: ../../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 "Oznaka"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Initrd-veli�ina"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "Uklanjam unos"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "Prazna oznaka nije dozvoljena"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Ova oznaka je ve� u upotrebi"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Koju vrstu particioniranja?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Prona�eno  %s %s interfejsa"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Da li imate jo� jedan?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Imate li jo� %s interfejsa?"
 
-#: ../../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 "Da"
 
-#: ../../any.pm_.c:613
+#: ../../any.pm_.c:602
 msgid "See hardware info"
 msgstr "Pogledaj informacije o hardveru"
 
 #. -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 "Instaliram drajver za %s karticu %s"
 
-#: ../../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 "Koji %s drajver da probam?"
 
-#: ../../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"
@@ -788,20 +804,20 @@ msgstr ""
 "sami da unesete dodatne podatke za njega, ili da ih drajver sam odredi?\n"
 "Mogu�e je da �e proba zaglaviti va� ra�unar, ali ne�e naneti nikakvu �tetu."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "Automatska proba"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Navedite opcije"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Mo�ete navesti njegove opcije za modul %s."
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -812,11 +828,11 @@ msgstr ""
 "Opcije su u formatu ``ime=vrednost ime2=vrednost2 ...''.\n"
 "Na primer, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Opcije modula:"
 
-#: ../../any.pm_.c:697
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -825,33 +841,33 @@ msgstr ""
 "Podizanje modula %s neuspelo.\n"
 "Da li �elite poku�ate ponovo sa drugim parametrima ?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s ve� postoji)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Ova lozinka je previ�e prosta"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Odredite korisni�ko ime"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Korisni�ko ime mo�e sadr�ati samo mala slova, brojeve, `-' i `_'"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "Ovo korisni�ko ime ve� postoji"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "Dodaj korisnika"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -860,55 +876,68 @@ msgstr ""
 "Unesi korisnika\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Prihvati korisnika"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "Pravo ime"
 
-#: ../../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 "Korisni�ko ime"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Auto logovanje"
 
-#: ../../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 ""
 "Ja mogu podesti va� ra�unar da automatski uloguje jednog korisnika.\n"
 "Ukoliko ne �elite da koristite ovu opciju, kliknite na  taster poni�ti"
 "(cancel) ?"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "Izaberite default (osnovnog) korisnika:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "Izaberite window menadzer koji �elite da koristite:"
 
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "IZaberite koji jezik �elite da korisitite:"
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr "Mo�ete izabrati drugi jezik koji �e biti dostupan posle instalacije "
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Sve"
+
 # 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"
@@ -931,7 +960,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 "Dobrodosli u GRUB  starter operativnog sistema !"
 
@@ -944,7 +973,7 @@ msgstr "Dobrodosli u GRUB  starter operativnog sistema !"
 #
 #. -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 "Koristi  %c i %c slova da bi oznacili izbor"
@@ -958,7 +987,7 @@ msgstr "Koristi  %c i %c slova da bi oznacili izbor"
 #
 #. -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 "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
 
@@ -971,7 +1000,7 @@ msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
 #
 #. -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 "komandi pri  podizanju sistema,ili  'c' za komandnu liniju "
 
@@ -984,26 +1013,31 @@ msgstr "komandi pri  podizanju sistema,ili  'c' za komandnu liniju "
 #
 #. -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 "Oznaceni izbor se podize automatski za %d sekundi"
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "nema dovoljno mesta u /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 meni "
 
+#: ../../bootloader.pm_.c:972
+#, fuzzy, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Gde biste da instalirate starter?"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
 msgstr "pomo� jo� nije implementirana.\n"
@@ -1016,524 +1050,700 @@ msgstr "Konfiguracija stila startanja"
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/_Datoteka/_Nova"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Datoteka/_Otvori"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Datoteka/_Sa�uvaj"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Datoteka/Sa�uvaj_Kao"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Datoteka/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Datoteka/_Izlaz"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Opcije"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Opcije/Test"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "_Pomo�"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Pomo�/_O..."
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Podesi"
-
-#: ../../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 ""
-"Dobrodo�li u alat za pode�avanje Deljenja Internet konekcije\n"
-"%s\n"
-"\n"
-"Kliknite na Podesi (Configure) da bi pokrenuli pode�avanje."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Lilo/Grub mod"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "NewStyle Monitor za kategorizaciju"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "NewStyle Monitor"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "Tradicionalni Monitor"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "Tradicionalni Gtk+ Monitor"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "Pokreni Auroru pri startanje"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/Grub mod"
+
+#: ../../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 ""
+"Trenutno koristite %s kao Boot menad�er \n"
+"Kliknite na Podesi (Configure) da bi pokrenuli pode�avavanje."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Podesi"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Startni mod"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Sistemski mod"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "Pokreni X-Window sistem pri stratanju"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Ne, ja ne �elim autologovanje"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Da, ja �elim autologovanje sa ovim(korisnik,desktop)"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Sistemski mod"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Podrazumevano"
-
-#: ../../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 "U redu"
 
-#: ../../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 "Obustavi"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "ne mogu otvoriti /etc/inittab za �itanje: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "ne mogu otvoriti /etc/sysconfig/autologin za �itanje: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "ne mogu otvoriti /etc/inittab za �itanje: %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 "Instalacija LILO-a neuspela. Gre�ka je:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Kreiraj"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Demontiraj"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Obri�i"
-
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatiranje"
+#: ../../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 "Promeni veli�inu"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Tip"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minuta"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Ta�ka montiranja"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minut"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Ispi�i /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekundi"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Pre�i na ekspert mod"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "Molim vas, prvo napravite kopiju va�ih podataka"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Pre�i na normalni mod"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "PA�LJIVO PRO�ITAJ !"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "Povrati (restore) iz datoteke"
+#: ../../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 ""
+"Ukoliko planirate da koristite  aboot, ostavite prazan prostor (2048 "
+"sektorana po�etku \n"
+"diska)"
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Snimi u datoteku"
+#: ../../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 "Gre�ka"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "�arobnjak (pomo�nik)"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "Povrati (restore) sa diskete"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Novi"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Snimi na disketu"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+#, fuzzy
+msgid "Remote"
+msgstr "Udaljeni red:"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "O�isti sve"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Ta�ka montiranja"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Formatiraj sve"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Opcije"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Auto dislociranje"
+#: ../../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 "Tip"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "Sve primarne particije su zauzete"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Demontiraj"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Ne mogu dodati vi�e ni jednu particiju"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Montiraj"
+
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "Izaberite akciju"
 
-#: ../../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 ""
-"Da bi omogu�ili kreiranje jo� (extended) particija izbri�ite jednu od "
-"postoje�ih"
+"Disk sadr�i jednu veliku FAT particiju\n"
+"(uglavnom je koriste MicroSoft Dos/Windows-i, na �alost).\n"
+"Predla�em da prvo izmenite veli�nu (resize) te particije (kliknite na nju,\n"
+"a potom na \"Promeni veli�inu\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Nema dovoljno slobodnog prostora za eauto-alociranje"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Kliknite na particiju"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "Poni�ti radnju"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "Kliknite na particiju"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Upi�i tabelu particija"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "Kliknite na particiju"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Jo�"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr ""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detalji"
 
-#: ../../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 "montiranje nije uspelo"
+
+#: ../../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 "Prazno"
 
-#: ../../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 "Drugo"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Vrsta fajl sistema:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detalji"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Kreiraj"
+
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Umesto toga probajte ``%s''"
 
-#: ../../diskdrake.pm_.c:147
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Obri�i"
+
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Prvo uradite ``Demontiraj''"
+
+#: ../../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 ""
-"Disk sadr�i jednu veliku FAT particiju\n"
-"(uglavnom je koriste MicroSoft Dos/Windows-i, na �alost).\n"
-"Predla�em da prvo izmenite veli�nu (resize) te particije (kliknite na nju,\n"
-"a potom na \"Promeni veli�inu\")"
+"Posle promene tipa particije %s, svi podaci na ovoj particiji �e biti "
+"izbrisani"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Molim vas, prvo napravite kopiju va�ih podataka"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Gde biste da montirate %s ure�aj ?"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "PA�LJIVO PRO�ITAJ !"
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "Opcije modula:"
 
-#: ../../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 ""
-"Ukoliko planirate da koristite  aboot, ostavite prazan prostor (2048 "
-"sektorana po�etku \n"
-"diska)"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "PA�LJIVO,ova operacija je opasna."
+#: ../../diskdrake.pm_.c:525
+#, fuzzy
+msgid "Removable media"
+msgstr "Automontiranje prenosivih medija"
 
-#: ../../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 "Gre�ka"
+#: ../../diskdrake.pm_.c:532
+#, fuzzy
+msgid "Change type"
+msgstr "Promena tipa particije"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Ta�ka montiranja: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Koju  datote�ni sistem �elite ?"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Ure�aj: "
+#: ../../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 "Oznaka DOS particije: %s (samo pretpostavka)\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 "Unesi: "
+#: ../../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 "Ime: "
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Server"
 
-#: ../../diskdrake.pm_.c:253
-#, c-format
-msgid "Start: sector %s\n"
-msgstr "Po�etak: 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 "Veli�ina: %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 sektora"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:258
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Cilindar %d do cilindra %d\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Izaberite akciju"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Formatirano\n"
+#: ../../diskdrake_interactive.pm_.c:163
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Kreiraj novu particiju"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Nije formatirano\n"
+#: ../../diskdrake_interactive.pm_.c:188
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Montirano\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to expert mode"
+msgstr "Pre�i na ekspert mod"
 
-#: ../../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 "Pre�i na normalni mod"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback fajl(ovi): %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "Poni�ti radnju"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Boot particija po default-u\n"
-"   (za podizanje MS-DOSa, ne za lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Svejedno nastaviti ?"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Nivo %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Kraj bez snimanja promena"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Chunk-uj %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Kraj bez snimanja promena u tabele particija?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-diskovi %s\n"
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Da li ho�ete da testirate konfiguraciju?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Ime Loopback datoteke: %s"
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Auto dislociranje"
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "O�isti sve"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Jo�"
+
+#: ../../diskdrake_interactive.pm_.c:250
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Detekcija hard diska"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Nema dovoljno slobodnog prostora za eauto-alociranje"
+
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Sve primarne particije su zauzete"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Ne mogu dodati vi�e ni jednu particiju"
+
+#: ../../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"
-"Najverovatnije je, da je ova particija\n"
-"Driver particija, pa nebi trebali\n"
-"da je dirate.\n"
+"Da bi omogu�ili kreiranje jo� (extended) particija izbri�ite jednu od "
+"postoje�ih"
+
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "Upi�i tabelu particija"
+
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "Spasi tabelu particija"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "Spasi tabelu particija"
+
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "Spasi tabelu particija"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:293
+#, fuzzy
+msgid "Removable media automounting"
+msgstr "Automontiranje prenosivih medija"
+
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "Izaberite datoteku"
+
+#: ../../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"
-"Ovo je specijalna Bootstrap\n"
-"particija i koristi se\n"
-"dual-booting va�eg sistema.\n"
+"Pohranjena(snimljena) tabela particija nije iste veli�ine\n"
+"�elite da nastavite ?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Kliknite na particiju"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Upozorenje"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Veli�ina: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Ubacite disketu u ure�aj\n"
+"Svi podaci na disketi �e biti izbrisani !"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometrija: %s cilindara, %s glava, %s sektora\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "Spasavanje tabele particija"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-diskovi %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+#, fuzzy
+msgid "Detailed information"
+msgstr "Prika�i informacije"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Tip tabele particija : %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "Promeni veli�inu"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "na busu %d ID %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Premesti"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Montiraj"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatiranje"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Aktiviraj"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Dodaj na RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Ukloni sa RAID-a"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "Promeni RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Dodaj na LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Ukloni sa RAID-a"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Ukloni sa LVM-a"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "Promeni RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Koristi za loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "Izaberite akciju"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Kreiraj novu particiju"
+
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Po�etni sektor: "
+
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Veli�ina u MB:"
+
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Vrsta tatote�nog sistema:"
+
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Ta�ka montiranja: "
+
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Karakteristike: "
+
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "Formatiranje loopback datoteke %s"
+
+#: ../../diskdrake_interactive.pm_.c:486
+msgid "Change partition type"
+msgstr "Promena tipa particije"
+
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr "Menjam ext2 na ext3"
 
-#: ../../diskdrake.pm_.c:435
+#: ../../diskdrake_interactive.pm_.c:521
+#, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "Gde biste da montirate loopback datoteku  %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 ""
+"Demontiranje nije mogu�e,jer se particija korisiti za loop back.\n"
+"Prvo uklonite loopback"
+
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "Prora�unavam granice FAT datote�nog sistema"
+
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "Promena veli�ine (resizing)"
+
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Ovoj particici nije mogu�e promeniti veli�inu"
+
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "Cvi podaci na ovoj particiji bi trebali biti sa�uvani"
+
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr "Posle promene veli�ine %s particije svi podaci �e biti izbrisani"
+
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "Izaberite novu veli�inu"
+
+#: ../../diskdrake_interactive.pm_.c:591
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Veli�ina u MB:"
+
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Which disk do you want to move it to?"
+msgstr "Koji disk �elite da premestite?"
+
+#: ../../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 "Gde �elite da instalirate starter?"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving"
+msgstr "Preme�tanje"
+
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "Moving partition..."
+msgstr "Preme�tanje particije..."
+
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "Izaberi postoje�i RAID za dodavanje"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "novi"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "Izaberi postoje�i LVM za dodavanje"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM ime?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Ova particija ne mo�e biti kori��ena za loopback "
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Ime Loopback datoteke: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+#, fuzzy
+msgid "Give a file name"
+msgstr "Pravo ime"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "Fajl se ve� koristi od strane drugog loopback-a,izaberite drugi"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Datoteka ve� postoji.Da li da ga koristim ?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "ure�aj"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "nivo"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "chunk veli�ina"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "PA�LJIVO,ova operacija je opasna."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Koju vrstu particioniranja?"
+
+#: ../../diskdrake_interactive.pm_.c:834
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -1543,7 +1753,7 @@ msgstr ""
 "Nije mogu�e kreirati /boot za sada na hard disku (na cilindru > 1024).\n"
 "Ili koristite LILO koji ne radi, ili ga ne koristite pa vam ne treba /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"
@@ -1555,7 +1765,7 @@ msgstr ""
 "Ukoliko planirate da korisitite LILO boot menad�er, morate\n"
 "dodati /boot particiji."
 
-#: ../../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"
@@ -1565,282 +1775,242 @@ msgstr ""
 "Nijedan starter ne mo�e da radi sa tim bez /boot particije.\n"
 "Zato pazite da dodate /boot particiju"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Umesto toga probajte ``%s''"
-
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Prvo uradite ``Demontiraj''"
-
-#: ../../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 ""
-"Posle promene tipa particije %s, svi podaci na ovoj particiji �e biti "
-"izbrisani"
-
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Svejedno nastaviti ?"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Kraj bez snimanja promena"
-
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Kraj bez snimanja promena u tabele particija?"
-
-#: ../../diskdrake.pm_.c:516
-msgid "Change partition type"
-msgstr "Promena tipa particije"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Koju  datote�ni sistem �elite ?"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Ne mo�ete koristiti ReiserFS za particije manje od 32MB"
-
-#: ../../diskdrake.pm_.c:537
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Gde biste da montirate loopback datoteku  %s?"
-
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Gde biste da montirate %s ure�aj ?"
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Tabela particija za ure�aj %s �e biti zapisana na disk!"
 
-#: ../../diskdrake.pm_.c:542
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
-msgstr ""
-"Demontiranje nije mogu�e,jer se particija korisiti za loop back.\n"
-"Prvo uklonite loopback"
+#: ../../diskdrake_interactive.pm_.c:868
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Morate restartovati ra�unar da bi se izmene izvr�ile"
 
-#: ../../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 ""
 "Posle formatiranja particije %s,svi podaci na ovoj particiji �e biti "
 "izbrisani"
 
-#: ../../diskdrake.pm_.c:563
+#: ../../diskdrake_interactive.pm_.c:881
 msgid "Formatting"
 msgstr "Formatiranje"
 
-#: ../../diskdrake.pm_.c:564
+#: ../../diskdrake_interactive.pm_.c:882
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Formatiranje loopback datoteke %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 "Formatiranje particije %s"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Posle formatiranja svih particija,"
-
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "svi podaci na njima �e biti uni�teni"
-
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Premesti"
-
-#: ../../diskdrake.pm_.c:577
-msgid "Which disk do you want to move it to?"
-msgstr "Koji disk �elite da premestite?"
-
-#: ../../diskdrake.pm_.c:578
-msgid "Sector"
-msgstr "Sektor"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid neuspelo"
 
-#: ../../diskdrake.pm_.c:579
-msgid "Which sector do you want to move it to?"
-msgstr "Gde �elite da instalirate starter?"
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "Nema dovoljno slobodnog prostora za alociranje novih particija"
 
-#: ../../diskdrake.pm_.c:582
-msgid "Moving"
-msgstr "Preme�tanje"
+#: ../../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 "Preme�tanje particije..."
+#: ../../diskdrake_interactive.pm_.c:906
+#, fuzzy
+msgid "Moving files to the new partition"
+msgstr "Nema dovoljno slobodnog prostora za alociranje novih particija"
 
-#: ../../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 "Tabela particija za ure�aj %s �e biti zapisana na disk!"
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:594
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Morate restartovati ra�unar da bi se izmene izvr�ile"
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Rezolucija: %s\n"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "Prora�unavam granice FAT datote�nog sistema"
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Ure�aj: "
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "Promena veli�ine (resizing)"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "Oznaka DOS particije: %s (samo pretpostavka)\n"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Ovoj particici nije mogu�e promeniti veli�inu"
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Unesi: "
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "Cvi podaci na ovoj particiji bi trebali biti sa�uvani"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Ime: "
 
-#: ../../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 "Posle promene veli�ine %s particije svi podaci �e biti izbrisani"
+msgid "Start: sector %s\n"
+msgstr "Po�etak: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "Izaberite novu veli�inu"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Veli�ina: %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 sektora"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Kreiraj novu particiju"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Cilindar %d do cilindra %d\n"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Po�etni sektor: "
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Formatirano\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Veli�ina u MB:"
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Nije formatirano\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Vrsta tatote�nog sistema:"
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Montirano\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Karakteristike: "
+#: ../../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 "Ova particija ne mo�e biti kori��ena za loopback "
+#: ../../diskdrake_interactive.pm_.c:965
+#, fuzzy, c-format
+msgid ""
+"Loopback file(s):\n"
+"   %s\n"
+msgstr "Loopback fajl(ovi): %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 ""
+"Boot particija po default-u\n"
+"   (za podizanje MS-DOSa, ne za lilo)\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Ime Loopback datoteke: "
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Nivo %s\n"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "Fajl se ve� koristi od strane drugog loopback-a,izaberite drugi"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Chunk-uj %s\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Datoteka ve� postoji.Da li da ga koristim ?"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-diskovi %s\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "Izaberite datoteku"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Ime Loopback datoteke: %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 ""
-"Pohranjena(snimljena) tabela particija nije iste veli�ine\n"
-"�elite da nastavite ?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Upozorenje"
+"\n"
+"Najverovatnije je, da je ova particija\n"
+"Driver particija, pa nebi trebali\n"
+"da je dirate.\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 ""
-"Ubacite disketu u ure�aj\n"
-"Svi podaci na disketi �e biti izbrisani !"
-
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "Spasavanje tabele particija"
-
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "ure�aj"
-
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "nivo"
-
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "chunk veli�ina"
+"\n"
+"Ovo je specijalna Bootstrap\n"
+"particija i koristi se\n"
+"dual-booting va�eg sistema.\n"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "Izaberi postoje�i RAID za dodavanje"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Veli�ina: %s\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "novi"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometrija: %s cilindara, %s glava, %s sektora\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "Izaberi postoje�i LVM za dodavanje"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Info: "
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "LVM ime?"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-diskovi %s\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Automontiranje prenosivih medija"
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Tip tabele particija : %s\n"
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "Spasi tabelu particija"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "na busu %d ID %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Ponovo unesi"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Opcije: %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 Formatiranje  %s nije uspelo"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "ne znam kako da formatiram %s u tipu %s"
 
-#: ../../fs.pm_.c:230
-msgid "mount failed: "
+#: ../../fs.pm_.c:568
+msgid "mount failed"
 msgstr "montiranje nije uspelo"
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr "fsck provera nije uspela sa kodom %d ili signalom %d"
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
+msgid "mount failed: "
+msgstr "montiranje nije uspelo: "
+
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "Gre�ka pri demontiranju %s: %s"
@@ -1853,41 +2023,44 @@ msgstr "jednostavno"
 msgid "server"
 msgstr "server"
 
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Ne mo�ete koristiti JFS za particije manje od 16MB"
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Ne mo�ete koristiti ReiserFS za particije manje od 32MB"
+
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
 msgstr "Ta�ke montiranja moraju da po�inju sa vode�im /"
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Ve� postoji particija sa ta�kom montiranja %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Kru�no montiranje  %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 "Ne mo�ete koristiti logi�ku LVM particiju za ta�ku montiranja %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "Ovaj direktorijum treba da ostane u root-u  datote�nog sistema"
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Potreban vam je pravi datote�ni sistem (ext2, reiserfs) za ovu ta�ku "
 "montiranja\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Gre�ka pri otvaranju %s za ispis: %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"
@@ -1896,334 +2069,410 @@ msgstr ""
 "novi datote�nog sistemi. Proverite va� hardver da vidite �ta je uzrok ovog "
 "problema."
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Nemate nijednu particiju!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr ""
-"Izaberite vama odgovaraju�i jezik za instaliranje i kori��enje 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 ""
-"Morate da prihvatite uslove licence da bi nastavili instalaciju.\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"
-"Molim vas da pritisnete na \"Prihvatam\" ukoliko se sla�ete sa uslovima.\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"
-"Molim vas da pritisnete na \"Odbijam\" ukoliko se ne sla�ete sa uslovima."
-"Instalacija�e biti zav�ena bez imakvih promena"
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "Izaberite tip komunikacije sa tastaturom od gore navedenih"
-
-#: ../../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 ""
-"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\"."
-
-#: ../../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 ""
+"Iznad se nalazi lista postoje�ih Linux particija koje su detektovane\n"
+"na hard disku. Mo�ete zadr�ati izbor koji je napravio �arobnjak, jer je "
+"dobar za a\n"
+"op�tu upotrebu. Ukoliko promenite izbor, morate bar izabrati root\n"
+"particiju (\"/\"). Nemojte da birate suvi�e malu particiju jer ne�ete mo�i "
+"da\n"
+"instalirate ovoljno softvera. Ukoliko �elite da podatke staviljate na "
+"posebnu particiju ,\n"
+"morate da izaberetei i \"/home\" (mogu�e je ukoliko imate vi�e od jedne\n"
+"Linux particije).\n"
 "\n"
-"Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
 "\n"
+"Informacija: svaka particija je prikazana na slede�i na�in: \"Ime\", "
+"\"Kapacitet\".\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"
+"\"Ime\" je kodirano na slede�i na�in: \"tip hard diska\", \"broj hard diska"
+"\",\n"
+"\"proj particije\" (na primer, \"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"
+"\"Tip hard diska\" je \"hd\" ukoliko je hard disk IDE ure�aj i  \"sd\"\n"
+"ukoliko je SCSI hard disk.\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 ""
-"Izaberite  \"Instalacija\" ukoliko nema prethodne verzijeLinux-Mandrake\n"
-"koja je instalirana ili ho�ete da koristite vi�e operativnih sistema.\n"
+"\"Broj hard diska\" je uvek slovo posle \"hd\" ili \"sd\". Sa IDE hard "
+"diskovima:\n"
 "\n"
+"   * \"a\" zna�i  \"master hard disk na primarnom  IDE kontroleru\",\n"
 "\n"
-"Izaberite \"A�uriranje\" ukoliko �elite da a�urirate postoje�u verziju Linux-"
-"Mandrake-a.\n"
+"   * \"b\" zna�i \"slave hard disk na primarnom IDE kontroloeru\",\n"
 "\n"
+"   * \"c\" zna�i \"master hard disk na sekundranom IDE kontroloeru\",\n"
 "\n"
-"U zavisnosti od va�eg poznavanja GNU/Linux-a, mo�ete izabrati jednu od "
-"slede�ih nivoa za instalaciju ili a�uriranje\n"
-"Linux-Mandrake operativnog sistema:\n"
+"   * \"d\" zna�i \"slave hard disk na sekundarnom IDE kontroleru\".\n"
 "\n"
-"\t* Preporu�eno: ukoliko niakada niste instalirali  GNU/Linux operativni "
-"sistem izaberite ovo. Instalacija �e biti\n"
-"\t  veoma laka i ima�ete da odgovorite na svega nekoliko pitanja.\n"
 "\n"
+"Sa SCSI hard diskovima, a \"a\" zna�i \"primarni hard disk\", a \"b\" zna�i "
+"\"sekundarni hard disk \", itd..."
+
+#: ../../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* Sa pode�avanjem(Customized): ukoiko vam je poznat GNU/Linux, mo�ete "
-"izabrati primarnu namenu za koju koistite operativni sistem (radna stanica, "
-"server,\n"
-"\t  razvojna stanica). Mora�ete da odgovorite na vi�e pitanja nego uthan in "
-"\"Preporu�eno\" instalacionoj\n"
-"\t  klasi, tako da morate da bolje poznajete kako radi GNU/Linux da bi "
-"izabrali ovuinstalacionu klasu.\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: ukoliko iamte dobro znanje o GNU/Linux-u, mo�ete izabrati ovu "
-"instalacionu klasu. Kao i \"Sa pode�avanjem\"\n"
-"\t  instalacionoj klasi, mo�i �ete da birate primarnu namenu (radna stanica, "
-"server, razvojna stanica). Budite veoma\n"
-"\t  pa�ljivi pre izbora ove instalacione klase. Mo�i �ete da izvodite veoma "
-"podesivu instalaciju.\n"
-"\t  Odgovori na neka pitanja mogu biti veoma te�ki ukoliko nemate dobro "
-"znanje o GNU/Linux-u. Dakle, nemojte birati \n"
-"\t  ovu instalacionu kasu ukoliko ne znate �ta radite."
-
-#: ../../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 ""
-"Izaberite:\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"
-" - Sa pode�avanjima (Customized): Ukoliko ste upoznati sa Linux-om mo�i "
-"�ete\n"
-"da izaberete normal,development ili server mod instalacije.\n"
-"Izaberite \"Normal\" instalaciju pri uobi�ajenom kori��enju ra�unara\n"
-"Mo�ete izabrati \"Development\" instalaciju ukoliko �ete se prvenstveno\n"
-"razvojem softvera, ili \"Server\" ukoliko �elite da postavite standardnu\n"
-"server ma�inu (za po�tu, �tampanje...)\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: Ukoliko ste dobro poznajte GNU/Linux i �elite izuzetno\n"
-"podesivu instalaciju onda je ovo pravi mod za vas. Mo�i �ete izabrati\n"
-"kori��enje sistema kao \"Preporu�eno\"."
+"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 ""
-"Sada morate definisati za �ta �ete koristiti va�u ma�inu.Va� izbor je:\n"
-"\n"
-"  - Radna stanica : ovo je idealan izbor ukoliko nameravate da koristite "
-"va�e ma�inuuglavnom za svakodnevnu upotrebu  (obrada teksta,tablice, grafika "
-"itd).\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"
-"  - Razvojna stanica: samo joj  ime ka�e. Izaberite ovo ukoliko imate nameru "
-"da va�u ma�inu uglavnom koristite za razvoj softvera. Tada �e te imati "
-"kompletnu\n"
-"kolekciju softvera  za kompajliranje, debagiranje i formatiranje\n"
-"izvornog koda, ili za kreiranje softverskoih paketa.\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"
-"  - Server: izaberite ovo ukoliko imate nameru da Linux-Mandrake\n"
-"koristite kao server. Ili kao fajl server (NFS ili  SMB),\n"
-"ili server protokol za �tampu(Unix' lp (Line Printer ili  Windows  SMB\n"
-"�tampanje) ili  autenti�ni server (NIS), ili kao server za bazu  podataka "
-"itd.\n"
-"Kao takav, on ne�e imati instaliran luksuz (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"
-"\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 �e potra�iti  PCI SCSI adapter(e).\n"
-"Ukoliko DrakX prona�e SCSI adapter(e) i bude znao koji upravlja�ki program "
-"(drajver) koristion �e ga(ih) automatski instalirati.\n"
+"Sada mo�ete odabrati koje servise �elite da se startaju pri podizanju "
+"sistema.\n"
 "\n"
 "\n"
-"Ukoliko nemate SCSI adapter, ili imate ISA SCSI adapter, ili  a\n"
-"PCI SCSI adapter koji DrakX ne mo�e da prepozna on �e vas pitati\n"
-"da li imate SCSI adapter u  ma�ini. Ukoliko nemate adapter\n"
-"samo kliknite na  'Ne'. Ukoliko kliknete na  'Da' pojavi�e se lista "
-"drajvera\n"
-"iz koje mo�ete odabrati odgovaraju�i za va� adapter.\n"
+"Kada mi�om pre�ete preko oznake servisa, pojavi�e se mali balon za pomo� "
+"koji \n"
+"opisuje ulogu servisa.\n"
 "\n"
 "\n"
-"Ukoliko morate ru�no da specificirate va� adapter, DrakX �e\n"
-"vas upitati da odredite opcije za njega.Treba li bi da dozvolite DrakX-u da\n"
-"ispita adapter radi tih opcija. Ovo obi�no i uspe.\n"
+"Budite posebno pa�ljivi u ovom koraku ukoliko nameravate da korisite ma�inu "
+"kao\n"
+"server: verovatno �e te �eleti da ne startujete\n"
+"bilo koji servis koji\n"
+"ne �elite."
+
+#: ../../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 radi sa u GMT (Greenwich Manage Time) i prevodi u lokalno\n"
+"uzavisnosti koju ste vremensku zonu odabrali."
+
+#: ../../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"
-"Ukoliko ne, mora�ete da sami odredite opcije za drajver.\n"
-"Pogledajte i Instalacioni vodi� za dodatna obja�njenja ili\n"
-"iskorisitite svoju Windows instalaciju (ukoliko je imate na sistemu),\n"
-"dokumenatciju o hardveru, ili sa proizvo�a�evog \n"
-"veb sajta (ukoliko imate pristup internetu)."
+"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 ""
 "U ovom trenutku, morate da izaberete gde �ete instalirati\n"
-"Linux-Mandrake operativni sistem na va� hard disk. Ukoliko je prazan ili\n"
+"Mandrake Linux operativni sistem na va� hard disk. Ukoliko je prazan ili\n"
 "postoje�i operativni sistem koristi sav postoje�i prostor na disku, treba da "
 "ga\n"
 "particionirate. U osnovi, particioniranje hard diska se sastoji logi�kog\n"
-"deljenja da bi obezbedili prostor za instalaciju va� novi Linux-Mandrake "
+"deljenja da bi obezbedili prostor za instalaciju va� novi Mandrake Linux "
 "sistem.\n"
 "\n"
 "\n"
@@ -2250,126 +2499,235 @@ msgstr ""
 "zavisnosti id konfiguracije\n"
 "hard diska, postoji nekoliko mogu�nosti:\n"
 "\n"
-"\t* Koristite postoje�e particije: �arobnjak je detektovao jednu ili vi�e "
+"* Koristite postoje�e particije: �arobnjak je detektovao jednu ili vi�e "
 "postoje�ihLinux particija na va�em hard disku. Ukoliko\n"
-"\t  �elite da ih zadr�ite, izaberite ovu opciju.\n"
+"  �elite da ih zadr�ite, izaberite ovu opciju.\n"
 "\n"
 "\n"
-"\t* Brisanje celog diska: ukoliko �elite da izbri�ete sve podatke i sve "
+"* Brisanje celog diska: ukoliko �elite da izbri�ete sve podatke i sve "
 "particije koji postoje na va�em hard disku i zamenite ih va�im\n"
-"\t  novim Linux-Mandrake sistemom, mo�ete da izaberete ovu ociju. Budite "
+"  novim Mandrake Linux sistemom, mo�ete da izaberete ovu ociju. Budite "
 "pa�ljivisa ovom opcijom, jer ne�ete biti u mogu�nosti\n"
-"\t  da povratite staro stanje nakon potvrde.\n"
+"  da povratite staro stanje nakon potvrde.\n"
 "\n"
 "\n"
-"\t* Koristite slobodan prostor na Windows particiji: ukoliko je Microsoft "
+"* Koristite slobodan prostor na Windows particiji: ukoliko je Microsoft "
 "Windowsinstaliran na hard disku i zauzima\n"
-"\t  sav prostor, morate da kreirate slobodan prostor za Linux. Da bi to "
+"  sav prostor, morate da kreirate slobodan prostor za Linux. Da bi to "
 "uradili morate izbrisati\n"
-"\t  Microsoft Windows particiju i podatke (pogledaj \"Brisanje celog diska\" "
+"  Microsoft Windows particiju i podatke (pogledaj \"Brisanje celog diska\" "
 "ili \"Ekspertni mod\" re�enja) ili da promenite veli�inu\n"
-"\t  Microsoft Windows particije. Taj postupak se mo�e izvesti bez "
+"  Microsoft Windows particije. Taj postupak se mo�e izvesti bez "
 "gubljenjapodataka. Ovo re�enje se preporu�uje\n"
-"\t  ukoliko �elite da koristite Linux-Mandrake i Microsoft Windows naistom "
+"  ukoliko �elite da koristite Mandrake Linux i Microsoft Windows naistom "
 "kompjuteru.\n"
 "\n"
 "\n"
-"\t  Pre nego izaberete ovu opciju, morate znati da �e veli�inaMicrosoft\n"
-"\t  Windows particije biti manja nego �to je sada. To zna�i da�ete imati "
-"manje prostora pod\n"
-"\t  Microsoft Windows-om za podatke ili instalaciju novog softvera.\n"
+"  Pre nego izaberete ovu opciju, morate znati da �e veli�inaMicrosoft\n"
+"  Windows particije biti manja nego �to je sada. To zna�i da�ete imati manje "
+"prostora pod\n"
+"  Microsoft Windows-om za podatke ili instalaciju novog softvera.\n"
 "\n"
 "\n"
-"\t* Ekspertni mod: ukoliko �elite da ru�no particionirate hard disk, "
-"mo�eteda izaberete ovu opciju. Budite pa�ljivi pre nego\n"
-"\t  izaberete ovu pociju. �er je ovo dobra ali i opasna stvar. Mo�etelako "
+"* Ekspertni mod: ukoliko �elite da ru�no particionirate hard disk, mo�eteda "
+"izaberete ovu opciju. Budite pa�ljivi pre nego\n"
+"  izaberete ovu pociju. �er je ovo dobra ali i opasna stvar. Mo�etelako "
 "izgubiti sve podatke. Dakle,\n"
-"\t  nemojte birati ovu opciju ukoliko ne znate �ta radite."
+"  nemojte birati ovu opciju ukoliko ne znate �ta radite."
 
-#: ../../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 ""
+"Svaka particija koja je novodefinisana mora biti\n"
+"formatirana za uptrebu (formatiranje zna�i kreiranje datote�nog(fajl) "
+"sistema).\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"
+"Sada mo�da �elite da reformatirate postoje�e particije da bi izbrisali\n"
+"podatke koje sadr�e. Ukoliko �elite to, izaberite particije \n"
+"koje �elite da formatizujete.\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"
+"Zapamtite da nije potrebno da reformatirate sve postoje�e particije.\n"
+"Morate da reformatirate particije koje sadr�e operativni sistem (kao �to su "
+"\"/\",\n"
+"\"/usr\" ili  \"/var\") ali ne morate da reformatirate particije koje sadr�e "
+"podatke\n"
+"koje �elite da zadr�ite (obi�no /home).\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"
+"Pazite pri biranju particija, posle formatiranja, sv podaci �e \n"
+"biti izbrisani i ne�ete ih mo�i povratiti.\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
 "\n"
+"Kliknite na \"U redu\" kada budete spreni za formatiranje particija.\n"
 "\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
 "\n"
+"Kliknite na  \"Poni�ti\" ukoliko �elite da izabereete druge particije za "
+"instalaciju novog\n"
+"Mandrake Linux operativnog sistema."
+
+#: ../../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 ""
+"Va� novi Mandrake Linux operativni sistem se trenutno\n"
+"instalira. Ova operacija bi trebala da potraje nekoliko minuta (u zavisnosti "
+"od veli�ine\n"
+"paketa koji se instaliraju i brzine va�eg kompjutera).\n"
+"\n"
+"\n"
+"Molim Vas za strpljenje.Hvala."
+
+#: ../../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 ""
 "Na ovoj ta�ki, morate izbrati koju\n"
-"particiju(e) �elite da koristite za instalaciju novog Linux-Mandrake "
+"particiju(e) �elite da koristite za instalaciju novog Mandrake Linux "
 "sistema. Ukoliko su particije\n"
 "ve� definisane (od predhodne instalacije ili od strane\n"
 "drugog alata za particije), mo�ete da koristite postoje�e particije. U "
@@ -2446,168 +2804,42 @@ msgstr ""
 "na primer50MB, mo�ete iskoristiti taj prostor za sme�tanje \n"
 "rezervnog kernela i ramdisk image za startanje u hitnim situacijama."
 
-#: ../../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"
+"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"
-"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"
+"\"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 ""
-"Iznad se nalazi lista postoje�ih Linux particija koje su detektovane\n"
-"na hard disku. Mo�ete zadr�ati izbor koji je napravio �arobnjak, jer je "
-"dobar za a\n"
-"op�tu upotrebu. Ukoliko promenite izbor, morate bar izabrati root\n"
-"particiju (\"/\"). Nemojte da birate suvi�e malu particiju jer ne�ete mo�i "
-"da\n"
-"instalirate ovoljno softvera. Ukoliko �elite da podatke staviljate na "
-"posebnu particiju ,\n"
-"morate da izaberetei i \"/home\" (mogu�e je ukoliko imate vi�e od jedne\n"
-"Linux particije).\n"
-"\n"
-"\n"
-"Informacija: svaka particija je prikazana na slede�i na�in: \"Ime\", "
-"\"Kapacitet\".\n"
-"\n"
-"\n"
-"\"Ime\" je kodirano na slede�i na�in: \"tip hard diska\", \"broj hard diska"
-"\",\n"
-"\"proj particije\" (na primer, \"hda1\").\n"
-"\n"
-"\n"
-"\"Tip hard diska\" je \"hd\" ukoliko je hard disk IDE ure�aj i  \"sd\"\n"
-"ukoliko je SCSI hard disk.\n"
-"\n"
-"\n"
-"\"Broj hard diska\" je uvek slovo posle \"hd\" ili \"sd\". Sa IDE hard "
-"diskovima:\n"
-"\n"
-"   * \"a\" zna�i  \"master hard disk na primarnom  IDE kontroleru\",\n"
-"\n"
-"   * \"b\" zna�i \"slave hard disk na primarnom IDE kontroloeru\",\n"
-"\n"
-"   * \"c\" zna�i \"master hard disk na sekundranom IDE kontroloeru\",\n"
-"\n"
-"   * \"d\" zna�i \"slave hard disk na sekundarnom IDE kontroleru\".\n"
-"\n"
-"\n"
-"Sa SCSI hard diskovima, a \"a\" zna�i \"primarni hard disk\", a \"b\" zna�i "
-"\"sekundarni hard disk \", itd..."
-
-#: ../../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 ""
-"Izaberite hard disk koji �elite da izbri�ete da bi instalirali \n"
-"novu Linux-Mandrake particiju. Budite pa�ljivi, svi podaci na njemu �e biti "
-"izgubljeni\n"
-"i ne�e se mo�i povratiti."
-
-#: ../../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 ""
-"Kliknite na \"U redu\" ukoliko �elite da izbri�ete sve podatke i \n"
-"particije na ovom hard disku.Budite pa�ljivi, psle klika na \"U redu\", vi\n"
-"ne�ete mo�i da povratite bilo kojipodata ili particiju na hard disku,\n"
-"pa i bilo koje Windows podatke.\n"
-"\n"
-"\n"
-"Kliknite na \"Poni�ti\" da bi poni�ti ovu operaciju bez gubljenja podataka "
-"i\n"
-"particija koje su prisutne na ovom hard disku."
-
-#: ../../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 ""
 "Jedna ili vi�e Microsoft Windows particija je detektovano \n"
 "na hard disku. Izaberite koju od njih �elite da smanjite da bi instalirali\n"
-"novi Linux-Mandrake operativni sistem.\n"
+"novi Mandrake Linux operativni sistem.\n"
 "\n"
 "\n"
 "Informacija: svaka particija je ispisana na slede�i na�in: \"Ime Linux-a\", "
@@ -2642,939 +2874,496 @@ msgstr ""
 "\"Ime Windows-a\" je slovo hard diska pod Windows-om (prvi diskdisk\n"
 "ili particija se zove \"C:\")."
 
-#: ../../help.pm_.c:306
+#: ../../help.pm_.c:491
 msgid "Please be patient. This operation can take several minutes."
 msgstr "Budite strpljivi.Trajanje ovih oeracija mo�e biti nekoliko minuta"
 
-#: ../../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"
-"\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 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 \"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"
-"Click on \"OK\" when you are ready to format partitions.\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"
-"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 ""
-"Svaka particija koja je novodefinisana mora biti\n"
-"formatirana za uptrebu (formatiranje zna�i kreiranje datote�nog(fajl) "
-"sistema).\n"
-"\n"
+"Izaberite  \"Instalacija\" ukoliko nema prethodne verzijeMandrake Linux\n"
+"koja je instalirana ili ho�ete da koristite vi�e operativnih sistema.\n"
 "\n"
-"Sada mo�da �elite da reformatirate postoje�e particije da bi izbrisali\n"
-"podatke koje sadr�e. Ukoliko �elite to, izaberite particije \n"
-"koje �elite da formatizujete.\n"
 "\n"
+"Izaberite \"A�uriranje\" ukoliko �elite da a�urirate postoje�u verziju "
+"Mandrake Linux-a.\n"
 "\n"
-"Zapamtite da nije potrebno da reformatirate sve postoje�e particije.\n"
-"Morate da reformatirate particije koje sadr�e operativni sistem (kao �to su "
-"\"/\",\n"
-"\"/usr\" ili  \"/var\") ali ne morate da reformatirate particije koje sadr�e "
-"podatke\n"
-"koje �elite da zadr�ite (obi�no /home).\n"
 "\n"
+"U zavisnosti od va�eg poznavanja GNU/Linux-a, mo�ete izabrati jednu od "
+"slede�ih nivoa za instalaciju ili a�uriranje\n"
+"Mandrake Linux operativnog sistema:\n"
 "\n"
-"Pazite pri biranju particija, posle formatiranja, sv podaci �e \n"
-"biti izbrisani i ne�ete ih mo�i povratiti.\n"
+"* Preporu�eno: ukoliko niakada niste instalirali  GNU/Linux operativni "
+"sistem izaberite ovo. Instalacija �e biti\n"
+"  veoma laka i ima�ete da odgovorite na svega nekoliko pitanja.\n"
 "\n"
 "\n"
-"Kliknite na \"U redu\" kada budete spreni za formatiranje particija.\n"
+"* Sa pode�avanjem(Customized): ukoiko vam je poznat GNU/Linux, mo�ete "
+"izabrati primarnu namenu za koju koistite operativni sistem (radna stanica, "
+"server,\n"
+"  razvojna stanica). Mora�ete da odgovorite na vi�e pitanja nego uthan in "
+"\"Preporu�eno\" instalacionoj\n"
+"  klasi, tako da morate da bolje poznajete kako radi GNU/Linux da bi "
+"izabrali ovuinstalacionu klasu.\n"
 "\n"
 "\n"
-"Kliknite na  \"Poni�ti\" ukoliko �elite da izabereete druge particije za "
-"instalaciju novog\n"
-"Linux-Mandrake operativnog sistema."
+"* Ekspert: ukoliko iamte dobro znanje o GNU/Linux-u, mo�ete izabrati ovu "
+"instalacionu klasu. Kao i \"Sa pode�avanjem\"\n"
+"  instalacionoj klasi, mo�i �ete da birate primarnu namenu (radna stanica, "
+"server, razvojna stanica). Budite veoma\n"
+"  pa�ljivi pre izbora ove instalacione klase. Mo�i �ete da izvodite veoma "
+"podesivu instalaciju.\n"
+"  Odgovori na neka pitanja mogu biti veoma te�ki ukoliko nemate dobro znanje "
+"o GNU/Linux-u. Dakle, nemojte birati \n"
+"  ovu instalacionu kasu ukoliko ne znate �ta radite."
 
-#: ../../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 ""
-"Sada mo�ete izabrati grupu paketa koje �elite\n"
-"da instalirate. ili a�urirate.\n"
-"\n"
-"\n"
-"DrakX �e zatim proveriti da li imate mesta za njihovo instaliranje.Ukoliko "
-"nema,\n"
-"on �e vas upozoriti na to. Ukoliko �elite da nastavite, nastavi�e se "
-"instalacija\n"
-"svih odabranih grupa ali �e neki paketi od manjeg zna�aja biti izostavljeni."
-"Na kraju liste\n"
-"mo�ete izabrati opcijy \"Pojedina�na selekcija paketa\";\n"
-"U tom slu�aju mora�ete birati izme�u vi�e od 1000 paketa..."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm_.c:534
 msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\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 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 ""
-"Sada mo�ete ru�no izabrati sve pakete koje\n"
-"�elite da instalirate.\n"
-"\n"
-"\n"
-"Mo�ete da ra�iriti ili skupiti stablo klikaju�i na opcije koje se nalazeu "
-"uglu\n"
-"prozora sa paketima.\n"
-"\n"
-"\n"
-"Ukoliko �elite da vidite pakete sortirane po abecednom redu, kliknite na "
-"ikonu\n"
-"\"Postavi ravno i grupno sortirano\".\n"
-"\n"
-"\n"
-"Ukoliko ne �elite da budete upozoreni na zavisnosti, kliknite na "
-"\"Automatske\n"
-"zavisnosti\". Ukoliko ovo �elite, zapamtite da deselektovanje jednog paketa "
-"mo�e neprime�eno\n"
-"da deselektuje i nekoliko drugih paketa koji zavise od njega."
-
-#: ../../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."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
-"Ukoliko imate sve gore navedene CD-ove, kliknite na Ok.\n"
-"Ukoliko nemate nijedan CD, kliknite na Cancel.\n"
-"Ako vam nedostaju  neki CD-ovi, deselektujete ih,a onda,\n"
-"kliknite na Ok."
 
-#: ../../help.pm_.c:369
+#: ../../help.pm_.c:547
 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"
-"\n"
-"Please be patient."
-msgstr ""
-"Va� novi Linux-Mandrake operativni sistem se trenutno\n"
-"instalira. Ova operacija bi trebala da potraje nekoliko minuta (u zavisnosti "
-"od veli�ine\n"
-"paketa koji se instaliraju i brzine va�eg kompjutera).\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"
-"Molim Vas za strpljenje.Hvala."
-
-#: ../../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 ""
-"Sada mo�ete da testirate mi�a. Pritiskajte tastere i pokrenite to�ki� da bi "
-"potvrdili\n"
-"da li su postavke dobre. Ukoliko nisu, kliknite na \"Poni�ti\" da bi "
-"izabrali drugi\n"
-"drajver."
 
-#: ../../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 ""
 "Molim, izaberite odgovaraju�i port. Na primer, COM1 port\n"
 "pod  MS Windows-om u Linux-u ima oznaku 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 ""
-"Ukoliko �elite da konektujte kompjyter na Internet ili\n"
-"na lokalnu mre�u izaberite pravu opciju. molim Vas da uklju�iteure�aj\n"
-"pre biranja prave opcije da bi dozvolili DrakX-u da ga auomatski detektuje.\n"
-"\n"
-"\n"
-"Ukoliko nemate vezu sa Internetom ili lokalnom mre�om, izaberite\n"
-"\"Isklju�i mre�u\".\n"
-"\n"
-"\n"
-"Ukoliko �elite da kasnije uradite konfiguraciju (nakon instalacije)ili ste\n"
-"zavr�ili konfigurisanje, izaberite \"Zavr�eno\"."
-
-#: ../../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 ""
-"Nijedam modem nije detektovan. Izaberite serijski port na kojem jemodem "
-"priklju�en.\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"
-"Da bi shvatili, prvi serijski portserial port (koji se zove \"COM1\" pod "
-"Microsoft\n"
-"Windows-om) se zove \"ttyS0\" pod Linux-om."
-
-#: ../../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 ""
-"Sada mo�ete uneti dialup postavke. Ukoliko ne znate ili \n"
-"ili niste sigurni �ta da unesete, prave informacije mo�ete dobitiod\n"
-"va�eg Internet provajdera. Ukoliko ne unesete DNS (ime servera)\n"
-"informaciju sada,ovu informaciju mo�ete imati kada se konektujetena servis\n"
-"va�eg Internet provajdera."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Ukoliko imate eksterni modem uklju�ite ga, da bi DrakX mogao automatski da "
-"ga detektuje."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Uklju�ite va� modem i izaberite pravi"
-
-#: ../../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 ""
-"Ukoliko niste sigurni da su gore navedene informacije\n"
-"ispravne ili niste sigurni �ta treba da unesete, prave\n"
-"informacije mo�ete dobaviti od va�eg Internet provajdera. Ukoliko ovdene\n"
-"unsete DNS (ime servera) informacije, ovu informaciju mo�etedobaviti\n"
-"od va�eg Internet provajdera kada se konektujete."
-
-#: ../../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 ""
-"Sada mo�ete uneti ime host-a ukoliko je potrebno. Ukoliko niste sigurni �ta "
-"da unesete,\n"
-"ispravne informacije �ete prona�i kod va�eg ISP-a."
-
-#: ../../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."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Sada mo�ete podesiti mre�nu karticu:\n"
-"\n"
-" - IP adresa: ukoliko je ne znate, kontaktirajte mre�nog administratora ili "
-"ISP.\n"
-"\n"
-"\n"
-" - Mre�na maska: \"255.255.255.0\" je ve�inom dobar izbor. Ukoliko niste\n"
-"sigurni, kontaktirajte mre�nog administratora ili ISP.\n"
-"\n"
-"\n"
-" - Automatski IP: ukoliko va�a mre�a koristi bootp ili dhcp protokole,\n"
-"izaberite ovu opciju. Ukoliko je selektovana, nije potrebna vrednost u\n"
-"\"IP adresa\". Ukoliko niste sigurni, kontaktirajte mre�og administratora "
-"ili ISP."
-
-#: ../../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 ""
-"Sada mo�ete uneti ime host-a ukoliko je potrebno. Ukoliko niste sigurni �ta "
-"da unesete,\n"
-"sigurni kontaktirajte va�eg administratora."
-
-#: ../../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 ""
-"Sada mo�ete uneti ime host-a ukoliko je potrebno.\n"
-"Ukoliko niste sigurni �ta da unesete, ostaite prazno."
-
-#: ../../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 ""
-"Sada unosite dialup opcije. Ukoliko niste sigurni �ta da unesete,\n"
-"ispravne informacije �ete prona�i kod va�eg 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 ""
-"Ukoliko koristite proksije, konfiguri�ite ih sada. Ukoliko ne znate\n"
-"da li �ete ih koristiti, konsultujte mre�og administratora ili ISP."
 
-#: ../../help.pm_.c:459
+#: ../../help.pm_.c:600
 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"
+"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"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"Mo�ete instalirati kriptografski paket ukoliko je internet konekcija\n"
-"pravilno pode�ena. Prvo izaberite prostor gde �ete download-ti pakete\n"
-"i nakon toga izabrati pakete koje �ete instalirati.\n"
-"\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
-"Morate izabrati mirror i kripto paket\n"
-"vode�i ra�una o zakonima."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Sada mo�ete podesiti vremensku zonu u zavisnosti od mesta gde �ivite"
-
-#: ../../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"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"GNU/Linux radi sa u GMT (Greenwich Manage\n"
-"Time) i prevodi u lokalno uzavisnosti koju ste vremensku zonu\n"
-"odabrali.\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"
-"Ukoliko koristite i  Microsoft Windows na svom kompjuteru, izaberite \"Ne\"."
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\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"
-"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 ""
-"Sada mo�ete odabrati koje servise �elite da se startaju pri podizanju "
-"sistema.\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"
-"Kada mi�om pre�ete preko oznake servisa, pojavi�e se mali balon za pomo� "
-"koji \n"
-"opisuje ulogu servisa.\n"
-"\n"
-"\n"
-"Budite posebno pa�ljivi u ovom koraku ukoliko nameravate da korisite ma�inu "
-"kao\n"
-"server: verovatno �e te �eleti da ne startujete\n"
-"bilo koji servis koji\n"
-"ne �elite."
-
-#: ../../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)."
+"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 ""
-"Mo�ete podesiti lokalni �tampa� (koji je povezan na kompjuter) ili udaljeni\n"
-"�tampa� (kojem mo�ete pristupiti preko Unix, Netware ili  Microsoft Windows "
-"mre�e)."
 
-#: ../../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 ""
-"Ukoliko �elite da imate mogu�nost da �tampate, morate da izaberete sistem za "
-"�tampanje izme�u\n"
-"CUPS ili LPR-a.\n"
-"\n"
-"\n"
-"CUPS je novi, mo�ni i fleksibilni sistem za �tampanje za Unix sisteme (CUPS\n"
-"je skra�enica za \"Common Unix Printing System\"). On je postavljen za "
-"default sistem za �tampanje u\n"
-"Linux-Mandrake-u.\n"
-"\n"
-"\n"
-"LPR je stari sistem za �tampanje koji se koristio u prethodnim Linux-"
-"Mandrake distribucijama.\n"
-"\n"
-"\n"
-"Ukoliko nemate �tampa�, kliknite na \"Nema\"."
-
-#: ../../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 ""
-"GNU/Linux mo�e da radi sa velikim brojem �tampa�a. Svaki od tipova �tampa�a "
-"zahteva\n"
-"druga�ije pode�avanje.\n"
-"\n"
-"\n"
-"Ukoliko je va� �tampa� fizi�ki vezan za kompjuter, izaberite opciju  "
-"\"Lokalni\n"
-"�tampa�\".\n"
-"\n"
-"\n"
-"Ukoliko �elite da pristupite �tampa�u koji se nalazi na udaljenoj Unix "
-"ma�ini, izaberite\n"
-"\"Udaljeni �tampa�\".\n"
+"LILO (the LInux LOader) i  Grub su starteri: oni omogu�avaju da startate \n"
+"ili  Linux ili bilo koji  drugi  operativni sistem prisutan na va�em "
+"kompjuteru.\n"
+"Naravno, ovi drugi operativni sistemi su ispravno detektovani i "
+"instalirani. \n"
+"Ukoliko to nije tako,mo�ete to sami urediti ovde.Pazite kada unosite\n"
+"parametre\n"
 "\n"
 "\n"
-"Ukoliko �elite da pristupite �tampa�u koji se nalazi na udaljenoj Microsoft "
-"Windows ma�ini\n"
-"(ili na Unix ma�ini koriste�i SMB protokol), izaberite \"SMB/Windows 95/98/NT"
-"\"."
+"Tako�e,mo�ete �eleti da ostalim operat.sistemima onemogu�ite da pristupe "
+"drugi \n"
+"U tom slu�aju, treba da izbri�ete odgovaraju�e linije za te sisteme. Ali\n"
+"onda morate imati boot diskete da bi ih startali !"
 
-#: ../../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"
-"\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"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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 ""
-"Molim vas da upalite �tampa� pre nego �to nastavite da bi DrakX mogao da ga "
-"detektuje.\n"
-"\n"
-"Ovde �ete morati da uneste neke podatke.\n"
-"\n"
-"\n"
-"   * Ime �tampa�a: �tampa�ev spooler koristi \"lp\" kao default ime za "
-"�tampa�. Dakle, morate imati �tampa� koji se zove \"lp\".\n"
-"     Ukoliko imate samo jedan �tampa�, mo�ete koristiti vi�e imena za njega. "
-"Treba samo da  ih odvojite pipe\n"
-"     karakterom (tj. \"|\"). Dakle, ukoliko volite ime koje ne�to i zna�i, "
-"morate da ga postavite na prvo mesto, na primer: \"Moj �tampa�|lp\".\n"
-"     �tampa� koji ima\"lp\" u svom imenu(nima) �e biti default �tampa�.\n"
-"\n"
-"\n"
-"   * Opis: ovo nije obavezna funkcija ali mo�e biti korisna ukoliko je vi�e "
-"�tampa�apovezano na va� kompjuter ili ukoliko �elite da dozvolite pristup\n"
-"     drugim kompjuterima na ovaj �tampa�.\n"
+"Morate ozna�iti gde �elite da postavite\n"
+"podatke potrebne za podizanje Linux-a.\n"
 "\n"
 "\n"
-"   * Lokacija: ukoliko �elite date neke informacije o lokaciji va�eg\n"
-"     �tampa�a, onda to mo�ete ovde uraditi (ovde mo�ete upisati bilo �ta,\n"
-"     na primer \"drugi sprat\").\n"
+"Ukoliko neznate ta�no �ta radite,izaberite \"Prvi sektor\n"
+"diska (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"
-"\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 ""
-"Ovde morate da unesete neke informacije.\n"
-"\n"
-"\n"
-"   * Ime �tampa�a: �tampa�ev spooler koristi \"lp\" kao default ime "
-"�tampa�a. Pa tako morate da imate �tampa� sa imenom \"lp\".\n"
-"    Ukoliko iamte samo jedan �tampa�, mo�ete da mu date vi�e imena. Samo "
-"ihodovojite pipe\n"
-"    karakterom (tj. \"|\"). Dakle, ukoliko vi�e volite imane sa zna�enjem, "
-"onda ga morae staviti na prvo mesto, na primer: \"Moj �tampa�|lp\".\n"
-"    �tampa� koji ima\"lp\" u svom imenu je ujedno i default �tampa�.\n"
-"\n"
-"  \n"
-"   * Spool direktorijum: to je direktorijum u kojem se nalaze zadati poslovi "
-"za �tampanje. Zadr�ite default izbor\n"
-"     ukoliko ne znate �ta da koristite\n"
-"\n"
-"\n"
-"   * Konektovanje �tampa�a: Ukoliko je �tampa� fizi�ki vezan za kompjuter, "
-"izaberite \"Lokalni �tampa�\".\n"
-"     Ukoliko �elite da pristupite �tampa�u koje lociran na udaljenoj Unix "
-"ma�ini, izaberite \"Udaljeni lpd �tampa�\".\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"
-"     Ukoliko �elite da pristupite �tampa�u koje lociran na udaljenoj "
-"Microsoft Windows  ma�ini (ili na Unix ma�ini koriste�i SMB\n"
-"     protokol), izaberite \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     Ukoliko �elite da pristupite �tampa�u koje lociran na NetWare mre�i, "
-"izaberite\"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 ""
-"Va� �tampa� nije detektovan. Unesite ime ure�aja/porta na\n"
-"koji je priklju�en.\n"
+"DrakX �e potra�iti  PCI SCSI adapter(e).\n"
+"Ukoliko DrakX prona�e SCSI adapter(e) i bude znao koji upravlja�ki program "
+"(drajver) koristion �e ga(ih) automatski instalirati.\n"
 "\n"
 "\n"
-"Za va�u informaciju, ve�ina �tampa�a je povezana na prvi paralelni port. A "
-"taj port\n"
-"se naziva \"/dev/lp0\" pod GNU/Linux-om i  \"LPT1\" pod  Microsoft Windows-"
-"om."
-
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Sada morate izabrati va� �tampa� sa gornje liste"
-
-#: ../../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"
+"Ukoliko nemate SCSI adapter, ili imate ISA SCSI adapter, ili  a\n"
+"PCI SCSI adapter koji DrakX ne mo�e da prepozna on �e vas pitati\n"
+"da li imate SCSI adapter u  ma�ini. Ukoliko nemate adapter\n"
+"samo kliknite na  'Ne'. Ukoliko kliknete na  'Da' pojavi�e se lista "
+"drajvera\n"
+"iz koje mo�ete odabrati odgovaraju�i za va� adapter.\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 ""
-"Molim vas izaberite prave opcije koje su u skladu sa va�im �tampa�em.\n"
-"Pogledajte i dokumentaciju koju  ste dobili uz �tampa� ukoliko ne znate �ta "
-"to ovde birate.\n"
+"Ukoliko morate ru�no da specificirate va� adapter, DrakX �e\n"
+"vas upitati da odredite opcije za njega.Treba li bi da dozvolite DrakX-u da\n"
+"ispita adapter radi tih opcija. Ovo obi�no i uspe.\n"
 "\n"
 "\n"
-"Mo�i �ete da testirate svoju konfiguraciju u slede�em koraku i mo�i �ete da "
-"menjatemo�i �ete da je menjate ukoliko neradti kako vi �elite."
+"Ukoliko ne, mora�ete da sami odredite opcije za drajver.\n"
+"Pogledajte i Instalacioni vodi� za dodatna obja�njenja ili\n"
+"iskorisitite svoju Windows instalaciju (ukoliko je imate na sistemu),\n"
+"dokumenatciju o hardveru, ili sa proizvo�a�evog \n"
+"veb sajta (ukoliko imate pristup internetu)."
 
-#: ../../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"
+"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"
-"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 ""
-"Sada, mo�ete uneti  root lozinku za va� Linux-Mandrake sistem.\n"
-"Lozinka mora biti uneta dva puta radi verifikacije da su oba unosa\n"
-"lozinki ista.\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"
-"Root je administrator sistema, i jedni korisnikkoji\n"
-"mo�e da modifikuje sistemske opcije. Zbog toga,\n"
-"birajte lozinku pa�ljivo! Nedozvoljeni pristup na root ra�un mo�ebiti veoma "
-"opasan\n"
-"za bezbednost sistema i podataka, kao i drugih povezanih sistema.\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"
-"Lozinka treba da me�avina alfanumeri�kih\n"
-"karaktera i najmanje 8 karaktera duga�ka.\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"
-"*Nikada* je ne zapisujte na papir. Ne pravite lozinku previ�edugom\n"
-"i komplikovanom, jer je morate upamtiti bez mnogo napora."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Da bi omogu�ili ve�u sigurnost sistema, izaberite \"Koristi shadow fajl\" i\n"
-"\"Use MD5 passwords\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"Ukoliko va� ra�unar koristi NIS, izaberite \"Koristi NIS\". Ukoliko niste\n"
-"sigurni kontaktirajte va�eg administratora."
-
-#: ../../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"
-"\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"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\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 ""
-"Sada mo�ete kreirati jedan ili vi�e obi�nih \"regular\" korisni�kih\n"
-"ra�una, nasuprot privilegovanom \"privileged\" korisni�kom ra�unu, root.\n"
-"Mo�ete kreirati jedan ili vi�e ra�una za svaku osobu koja �eli koristiti\n"
-"ra�unar. Nema limita. Svaki korisnik �e imati sopstveno pode�ene parametre\n"
-"(grafi�ko okru�enje, kao i svoj home direktorijum \"Osnovna direktorijum\",\n"
-"u kojem se ovi parametri i nalaze.\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"
-"Pre svega, napravite ra�un za va� same! �ak i ukoliko �ete biti jedini\n"
-"korisnik na ra�unaru, NE treba da se konektujete kao root za svakodnevnu\n"
-"upotrebu sistema: to je veoma veliki sigurnosni rizik. Mo�ete sistem\n"
-"u�initi nestabilnim ili ga �ak onesposobiti �to je �esta pojava !\n"
-"Zbog toga, TREBA da se konektujete koriste�i obi�an korisnik . Ra�un koji\n"
-"�ete kreirati ovde, a root ra�un koristiti SAMO pri administriranju ili\n"
-"odr�avanju sistema."
-
-#: ../../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 ""
-"Kreiranje startne(boot) diskete je vrlo preporu�ljivo. Ukoliko ne mo�ete da\n"
-"startujete kompjuter, to je jedini na�in da spasite sistem od\n"
-"reinstalacije."
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\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"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
+" * 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 ""
-"Morate ozna�iti gde �elite da postavite\n"
-"podatke potrebne za podizanje Linux-a.\n"
+"Mo�ete dodati i dodatne unose za yabbot, ili za druge operativne ssisteme,\n"
+"alternativne kernele, ili za emergency boot image.\n"
 "\n"
 "\n"
-"Ukoliko neznate ta�no �ta radite,izaberite \"Prvi sektor\n"
-"diska (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 ""
-"Ukoliko nije druga�ije odre�eno, oubi�ajen izbor je \"/dev/hda\"\n"
-"(master disk na primarnom kanalu) ili \"/dev/sda\" (first SCSI disk)."
-
-#: ../../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"
+"Za druge OS-ove - unos sadr�i samo oznaku i  root particiju.\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 ""
-"LILO (the LInux LOader) i  Grub su starteri: oni omogu�avaju da startate \n"
-"ili  Linux ili bilo koji  drugi  operativni sistem prisutan na va�em "
-"kompjuteru.\n"
-"Naravno, ovi drugi operativni sistemi su ispravno detektovani i "
-"instalirani. \n"
-"Ukoliko to nije tako,mo�ete to sami urediti ovde.Pazite kada unosite\n"
-"parametre\n"
+"Za Linux, postoji nekoliko mogu�nosti: \n"
 "\n"
 "\n"
-"Tako�e,mo�ete �eleti da ostalim operat.sistemima onemogu�ite da pristupe "
-"drugi \n"
-"U tom slu�aju, treba da izbri�ete odgovaraju�e linije za te sisteme. Ali\n"
-"onda morate imati boot diskete da bi ih startali !"
-
-#: ../../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"
+"  - Oznaka: Ovo je jednostavno ime koje �ete ukucati pri yaboot promptu da "
+"bi izabrali ovu \n"
+"startnu opciju.\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"
+"  - Image: Ovo je ime kernela koji se startuje.  Obi�no vmlinux ili \n"
+"varijacija vmlinux sa ekstenzijom.\n"
 "\n"
 "\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
+"  - Root: root ure�aj ili '/' za va�u Linux instalaciju.\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
+"  \n"
+"  - Dodatak: Na Apple hardveru, kernelova opcija se koristi za prili�no "
+"�esto da\n"
+"asistira inicijalizaciju video hardvera, ili da omogu�i emulaciju tastera za "
+"mi� na tastaturi zbog \n"
+"�estog nedostatka drugog i tre�eg tastera na Apple mi�evima.  Sledi par \n"
+"primera:\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"
+"\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
+"\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \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 ""
-"Glavne opcije za LILO i grub su:\n"
-"  - Boot ure�aj: Pode�ava ime ure�aja (npr. hard disk particije)\n"
-"koji sadr�i boot sektor. Ukoliko druga�ije nije odre�eno,\n"
-"izaberite \"/dev/hda\".\n"
 "\n"
+" \n"
+"  - Initrd: Ova opcija se mo�e koristiti ili za podizanje inicijalnih "
+"modula, pre nego je boot \n"
+"ure�aj dostupan, ili za podizanje ramdisk image za startanje u "
+"hitnimsituacijama.\n"
 "\n"
-"  - Pauza pre startanja default image-a: Specificira broj u desetim "
-"delovima\n"
-"sekunde za koji starter treba da �eka pre startanja prvog image-a.\n"
-"Ovo je korisno na sistemima koji odmah startaju sa hard diska posle\n"
-"detekcije tastaure. Starter ne �eka ukoliko je  \"delay\" \n"
-"prazno ili pode�eno na 0 - nula .\n"
 "\n"
+"  - Initrd-veli�ina: veli�ina default ramdisk je generalno 4096 bajta.  "
+"Ukoliko vam treba\n"
+"alociranje velikog ramdisk-a, ova opcija mo�e biti korisna.\n"
 "\n"
-"  - Video mod: Ovaj mod pode�ava VGA tekst mod koji se bira pri\n"
-"startanju. Mogu�e su slede�e vrednosti: \n"
 "\n"
-"    * normalno: koristi normalni 80x25 tekst mod.\n"
+"  - Read-write: Normalno se 'root' particija inicijalno postavlja kao read-"
+"only, da bi omogu�ila\n"
+"proveru datote�nog sistema pre nego sistem postane 'aktivan'.  Ovde mo�ete "
+"poni�titi ovu opciju.\n"
 "\n"
-"    * <broj>: koristi korespondentni tekst mod.\n"
 "\n"
-"  - O�isti \"/tmp\" pri svakom startanju : ukoliko �elite da uklonite sve "
-"datoteke i direktorijume\n"
-"koji sse nalaze u \"/tmp\" kada startuje sistem, selektujte ovu opciju.\n"
+"  - NoVideo: Ukoliko se Apple video hardver poka�e veoma problemati�nim, "
+"mo�ete\n"
+"izabrati ovu opciju da bi startali sistem u 'novideo' modu, sa osnovnom "
+"framebuffer podr�kom.\n"
 "\n"
 "\n"
-"  - Defini�ite RAM ukoliko je potrebno: na �alost, ne postoji standardni "
-"metod  upit\n"
-"BIOS-u o veli�ini RAM prisutnog u va�em kompjuteru. Kao posledica toga, "
-"Linux mo�e\n"
-"fpogre�no detektovati veli�inu RAM memorije. Ukoliko se to desi, mo�ete\n"
-"ovde sami uneti pravu veli�inu RAMa. Zapamtite da razlika u  2 ili 4\n"
-"MB izme�u detektovane i stvarne veli�ine RAMa u sistemu �este normalna stvar."
+"  - Default: Kako je ovo default Linux selekcija, dovoljno je da samo\n"
+"pritisnete ENTER pri yaboot promptu.  Ovaj unos �e tako�e biti dodatno "
+"ozna�en sa '*', ukoliko\n"
+"pritisnete TAB da bi videli startnu selekciju."
 
-#: ../../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 ""
 "Yaboot je starter NewWorld MacIntosh hardver. On mo�e da pokrene\n"
 "GNU/Linux, MacOS, ili MacOSX, ukoliko su prisutni na va�oj ma�ini.\n"
@@ -3622,343 +3411,78 @@ msgstr ""
 "kao default kada Open Firmware \n"
 "pauza zavr�i."
 
-#: ../../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"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
-"  - Root: The root device or '/' for your Linux installation.\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"
-"  \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"
-"\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 ""
-"Mo�ete dodati i dodatne unose za yabbot, ili za druge operativne ssisteme,\n"
-"alternativne kernele, ili za emergency boot image.\n"
-"\n"
-"\n"
-"Za druge OS-ove - unos sadr�i samo oznaku i  root particiju.\n"
-"\n"
-"\n"
-"Za Linux, postoji nekoliko mogu�nosti: \n"
-"\n"
-"\n"
-"  - Oznaka: Ovo je jednostavno ime koje �ete ukucati pri yaboot promptu da "
-"bi izabrali ovu \n"
-"startnu opciju.\n"
-"\n"
-"\n"
-"  - Image: Ovo je ime kernela koji se startuje.  Obi�no vmlinux ili \n"
-"varijacija vmlinux sa ekstenzijom.\n"
-"\n"
-"\n"
-"  - Root: root ure�aj ili '/' za va�u Linux instalaciju.\n"
-"\n"
-"\n"
-"  \n"
-"  - Dodatak: Na Apple hardveru, kernelova opcija se koristi za prili�no "
-"�esto da\n"
-"asistira inicijalizaciju video hardvera, ili da omogu�i emulaciju tastera za "
-"mi� na tastaturi zbog \n"
-"�estog nedostatka drugog i tre�eg tastera na Apple mi�evima.  Sledi par \n"
-"primera:\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: Ova opcija se mo�e koristiti ili za podizanje inicijalnih "
-"modula, pre nego je boot \n"
-"ure�aj dostupan, ili za podizanje ramdisk image za startanje u "
-"hitnimsituacijama.\n"
-"\n"
-"\n"
-"  - Initrd-veli�ina: veli�ina default ramdisk je generalno 4096 bajta.  "
-"Ukoliko vam treba\n"
-"alociranje velikog ramdisk-a, ova opcija mo�e biti korisna.\n"
-"\n"
-"\n"
-"  - Read-write: Normalno se 'root' particija inicijalno postavlja kao read-"
-"only, da bi omogu�ila\n"
-"proveru datote�nog sistema pre nego sistem postane 'aktivan'.  Ovde mo�ete "
-"poni�titi ovu opciju.\n"
-"\n"
-"\n"
-"  - NoVideo: Ukoliko se Apple video hardver poka�e veoma problemati�nim, "
-"mo�ete\n"
-"izabrati ovu opciju da bi startali sistem u 'novideo' modu, sa osnovnom "
-"framebuffer podr�kom.\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"
-"  - Default: Kako je ovo default Linux selekcija, dovoljno je da samo\n"
-"pritisnete ENTER pri yaboot promptu.  Ovaj unos �e tako�e biti dodatno "
-"ozna�en sa '*', ukoliko\n"
-"pritisnete TAB da bi videli startnu selekciju."
-
-#: ../../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"
+" * \"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"
-"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 ""
-"SILO je starter za SPARC: on mo�e da starta\n"
-"ili Linux ili bilo koji  drugi  operativni sistem prisutan na va�em "
-"kompjuteru.\n"
-"Naravno, ovi drugi operat.sistemi su ispravno detektovani i instalirani. \n"
-"Ukoliko to nije tako,mo�ete to sami urediti ovde.Pazite kada unosite "
-"parametre\n"
-"\n"
-"\n"
-"Tako�e,mo�ete �eleti da ostalim operat.sistemima onemogu�ite da pristupe "
-"drugi \n"
-"U tom slu�aju, treba da izbri�ete odgovaraju�e linije za te sisteme. Ali\n"
-"onda morate imati boot diskete da bi ih startali !"
 
-#: ../../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 ""
-"SILO glavne opcije su:\n"
-"  - Instalacija startera: nazna�ite gde �elite da smestite informacije\n"
-"potrebne za startanje Linux-a.Ukoliko ne znate ta�no �ta radite,\n"
-"izaberite \"Prvi sektor hard diska (MBR)\".\n"
-"\n"
-"\n"
-"  - Pauza pre startanja default image-a: Specificira broj u desetim "
-"delovima\n"
-"sekunde za koji starter treba da �eka pre startanja prvog image-a.\n"
-"Ovo je korisno na sistemima koji odmah startaju sa hard diska posle\n"
-"detekcije tastaure. Starter ne �eka ukoliko je  \"delay\" \n"
-"prazno ili pode�eno na 0 - nula ."
+"Izaberite hard disk koji �elite da izbri�ete da bi instalirali \n"
+"novu Mandrake Linux particiju. Budite pa�ljivi, svi podaci na njemu �e biti "
+"izgubljeni\n"
+"i ne�e se mo�i povratiti."
 
-#: ../../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"
-"\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"
-"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 ""
-"Sada je do�lo vreme da podesimo X Window sistem, koji je\n"
-"jezgro Linux GUI-a (Linux Grafi�ko Korisni�ko Okru�enje). U tu svrhu,\n"
-"morate konfigurisati va�u video kartu i monitor. Ve�inom\n"
-"su ovi postupci automatizovani, tako da se va� posao mo�e\n"
-"svesti na potvr�ivanje onog �to je ura�eno i prihvatanje\n"
-"pode�enih opcija :-)\n"
+"Kliknite na \"U redu\" ukoliko �elite da izbri�ete sve podatke i \n"
+"particije na ovom hard disku.Budite pa�ljivi, psle klika na \"U redu\", vi\n"
+"ne�ete mo�i da povratite bilo kojipodata ili particiju na hard disku,\n"
+"pa i bilo koje Windows podatke.\n"
 "\n"
 "\n"
-"Kada konfiguracija bude zavr�ena, X-ovi �e se podi�i (osim ako\n"
-"ka�ete DrakX-u da to ne radi!) tako da mo�ete isprobati da li je\n"
-"sve pode�eno kako valja. Ako se ne podignu, vratite se korak nazad\n"
-"i promenite pode�avanje koliko god puta je potrebno."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"Ukoliko je ne�to pogre�no u X konfiguraciji, koristite ove opcije\n"
-"da bi ispravno podeesili X Window sistem."
-
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Ukoliko vi�e volite logovanje u grafi�kom modu, izaberite \"Da\".\n"
-"U suprotnom izaberite \"Ne\"."
-
-#: ../../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 ""
-"Mo�ete izabrati sigurnosni nivo za va� sistem. Pogledajte upustvo za vi�e\n"
-"  informacija. U osnovi, ukoliko ne znate �ta da odaberetee, ostavite "
-"default opciju.\n"
+"Kliknite na \"Poni�ti\" da bi poni�ti ovu operaciju bez gubljenja podataka "
+"i\n"
+"particija koje su prisutne na ovom hard disku."
 
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"Sistem �e se resetovati.\n"
-"\n"
-"Posle resetovanja, va� novi Linux-Mandrake sistem �e se podi�i automatski.\n"
-"Ukoliko �elite da podignete neki drugi instalirani operativni sistem,\n"
-"pro�itate upustvo ili posetite neki od Linux chat kanala."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Izaberite jezik"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Izaberite inst.klasu"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Detekcija hard diska"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Pode�avanje mi�a"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Izaberi tastaturu"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Sigurnost"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Podesi datote�ne sisteme"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formatiraj particije"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Paketi za instalaciju"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Instaliraj sistem"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Unesi root lozinku"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Dodaj korisnika"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Podesi mre�u"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Sa�etak"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Podesi servise"
 
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Napravi startni disk"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Instaliraj starter"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Konfigurisanje X-a"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Izlaz iz instalacije"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3972,21 +3496,32 @@ msgid ""
 "\n"
 "Do you really want to install these servers?\n"
 msgstr ""
+"Vi ste izabrali sledegje servere: %s\n"
+"\n"
+"\n"
+"Ovi serveri se aktiviraju po osnovnoj postavci. Oni nemaju poznatih "
+"sigurnosnih\n"
+"nedostataka, ali se ipak mogu pojaviti neki novi. Ukoliko se to desi, morate "
+"ih a�urirati\n"
+"�to je pre mogugje.\n"
+"\n"
+"\n"
+"Da li zaista �elite da instalirate ove servise?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Nije mogu� prenos bez NIS domena"
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Ubacite FAT formatiranu praznu disketu u ure�aj %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "Ova disketa nije formatirana sa FAT sistemom"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3994,30 +3529,20 @@ msgstr ""
 "Da bi koristili ovaj izbor za �uvanje selekcije paketa, izaberite "
 "instalaciju sa ``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Gre�ka kod otvaranja fajla $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Gre�ka kod otvaranja datoteka %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 "U redu"
 
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Molim Vas da testirate mi�a"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "Da bi mogli da aktivirate mi�a"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "pomerite to�ki� !"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -4028,7 +3553,7 @@ msgstr ""
 "da bi normalno funkcionisale.\n"
 "Informacije o njima mo�ete prona�i na: %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"
@@ -4038,11 +3563,11 @@ msgstr ""
 "Za ovo, kreirajte particiju (ili kliknite na postoje�u).\n"
 "Zatim izaberite \"Ta�ka montiranja\" i podesite na `/'"
 
-#: ../../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 "Morate imati swap particiju"
 
-#: ../../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"
@@ -4052,55 +3577,59 @@ msgstr ""
 "\n"
 "Svejedno nastaviti dalje ?"
 
-#: ../../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 "Morate imati FAT particiju montiranu u /boot/efi"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Koristi slobodan prostor"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Nema dovoljno slobodnog prostora za alociranje novih particija"
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Koristi postoje�u particiju"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
 msgstr "Nema ni jedne pariticije za rad"
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Koristi Windows particiju za loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Koju particiju �elite da korisite za Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "Izaberite veli�inu"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
 msgstr "Veli�ina Root particije u MB:"
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
 msgstr "Veli�ina Swap particije u MB:"
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Korisiti slobodan prostor na Windows particiji"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Kojoj particiji  �elite da promenite veli�inu?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "Prora�unavam granice Windows fajl-sistema"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4110,12 +3639,12 @@ msgstr ""
 "particijom, \n"
 "zbog slede�e gre�ke: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Va�a Windows particija je previ�e fragmentirana, prvo pokrenite ``defrag''"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4133,21 +3662,21 @@ msgstr ""
 "scandisk (eventualno i defrag), a onda ponovo pokrenite instalaciju.\n"
 "Ako ste sigurni, pritisnite Ok (U redu)."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Koju veli�inu �elite da zadr�ite za prozore"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "particija %s "
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT izmena veli�ine neuspela: %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)"
@@ -4155,34 +3684,34 @@ msgstr ""
 "Ne postoje FAT particije kojima se mo�e promeniti veli�ina ili koje se mogu "
 "korisititi za loopback (ili nema dovoljno slobodnog prostora)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Izbri�i celi disk"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
 msgstr "Ukloni 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 ""
 "Imate vi�e od jednog hard diska, na koji od njih �elite da instalirate "
 "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 "SVE postoje�e particije i podaci na disku %s �e biti izgubljeni"
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Custom disk particioniranje"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Koristi fdisk"
 
-#: ../../install_interactive.pm_.c:172
+#: ../../install_interactive.pm_.c:181
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4191,28 +3720,28 @@ msgstr ""
 "Sada mo�ete particionirati va� %s hard disk ure�aj\n"
 "Kada zavr�ite,ne zaboravite da potvrdite koriste�i `w'"
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Nemate dovoljno slobodnog prostora na Windows particiji"
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
 msgstr "Ne mogu da prona�em slobodan prostor za instaliranje"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX �arobnjak za particioniranje je prona�ao slede�a re�enja:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Particioniranje nije uspelo : %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Pristupam  mre�u"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Odstupam od mre�e"
 
@@ -4224,12 +3753,12 @@ msgstr ""
 "Gre�ka, ali neznam kako da je razre�im.\n"
 "Nastavite na va� rizik!"
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Duplirana ta�ka montiranja %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"
@@ -4241,16 +3770,16 @@ msgstr ""
 "Proverite cdrom na instaliranom kompjuteru koriste�e \"rpm -qpl Mandrake/"
 "RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "Dobro�li u  %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
 msgstr "Nepristupa�an disketni ure�aj"
 
-#: ../../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"
@@ -4264,32 +3793,32 @@ msgstr "Izaberite veli�inu komponenti za instalaciju"
 msgid "Total size: "
 msgstr "Ukupna veli�ina: "
 
-#: ../../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 "Verzija: %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 "Veli�ina: %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 "Izaberi pakete za instalaciju"
 
-#: ../../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 "Instaliraj"
 
-#: ../../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 "Instaliram"
 
@@ -4297,7 +3826,7 @@ msgstr "Instaliram"
 msgid "Please wait, "
 msgstr "Molim sa�ekajte"
 
-#: ../../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 "Preostalo vreme"
 
@@ -4306,21 +3835,21 @@ msgid "Total time "
 msgstr "Ukupno vreme"
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "Pripremam instalaciju"
 
-#: ../../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 "Instaliram paket %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 "Svejedno nastaviti dalje ?"
 
-#: ../../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 "Gre�ka u listi paketa:"
 
@@ -4328,30 +3857,34 @@ msgstr "Gre�ka u listi paketa:"
 msgid "Use existing configuration for X11?"
 msgstr "Da li da koristim postoje�u konfiguraciju za 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 ""
 "Va� sistem ima manjak snage. Usled toga mo�ete imati problema pri "
 "instalaciji\n"
-"Linux-Mandrake. Ukoliko se oni pojave, mo�ete probati tekstualnu "
+"Mandrake Linux. Ukoliko se oni pojave, mo�ete probati tekstualnu "
 "instalaciju. Da bi to postigli,\n"
 "pritisnite `F1' pri startanju sa CDROM-a, a onda ukucajte  `text'."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Instalacione klase"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Molim vas da izabeterte jednu od slede�ih instalacionih klasa:"
 
-#: ../../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 "Ukupna veli�ina grupa koje ste izabrali iznosi  %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"
@@ -4366,7 +3899,7 @@ msgstr ""
 "Pri malom procentu �e se instalirati samo va�ni paketi;\n"
 "dok �e pri procentu od 100%% biti instalirani svi paketi."
 
-#: ../../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"
@@ -4383,83 +3916,67 @@ msgstr ""
 "Pri malom procentu �e se instalirati samo va�ni paketi;\n"
 "dok �e pri procentu od  %d%% biti instalirano maksimalno mogu� broj paketa"
 
-#: ../../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 "Mo�i �ete da ih preciznije birate u slede�em koraku."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
 msgstr "Procenat paketa za instalaciju"
 
-#: ../../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 "Odabir grupa paketa"
 
-#: ../../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 "Pojedina�no biranje paketa"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "Automatski prika�i izabrane pakete"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Pro�iri stablo"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Skupi stablo"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Birajte: ravno ili grupno sortirano"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Ukupna veli�ina: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Lo� paket"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Ime: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Va�no: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Ukupna veli�ina: %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 "Ne mo�ete selektovati ovaj paket jer nema vi�e slobodnog prostora"
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "Slede�i paketi treba da budu instalirani"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "Slede�i paketi �e biti izbrisani"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
 msgstr "Ne mo�ete selektovati/deselektovati ovaj paket"
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Ovo je obavezni paket,i ne mo�e biti deselektovan"
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
 msgstr "Mo�ete deselektovati ovaj paket jer je ve� instaliran"
 
-#: ../../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?"
@@ -4467,24 +3984,40 @@ msgstr ""
 "Ovaj paket mora biti a�uriran\n"
 "Da li sigurno �elite da ga deselektujete ?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Ne mo�ete deselektovati ovaj paket.On mora biti a�uriran"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Automatski prika�i izabrane pakete"
+
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "U�itaj/Snimi na disketu"
+
+#: ../../install_steps_gtk.pm_.c:461
+msgid "Updating package selection"
+msgstr "A�uriranje selekcije paketa"
+
+#: ../../install_steps_gtk.pm_.c:466
+msgid "Minimal install"
+msgstr "Minimalno instaliraj"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Procenjujem"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
 msgstr "Samo momenat, pripremam instalaciju"
 
-#: ../../install_steps_gtk.pm_.c:613
+#: ../../install_steps_gtk.pm_.c:553
 #, c-format
 msgid "%d packages"
 msgstr "%d paketa"
 
-#: ../../install_steps_gtk.pm_.c:652
+#: ../../install_steps_gtk.pm_.c:599
 msgid ""
 "\n"
 "Warning\n"
@@ -4549,15 +4082,15 @@ msgstr ""
 "respektativnim autorima i za�ti�ene su zakonima o intelektuanoj svojini i \n"
 "pravima koji se primenjuju na softverske programe.\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 "Prihvati"
 
-#: ../../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 "Odbaci"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4568,10 +4101,11 @@ msgid ""
 msgstr ""
 "Promenite va� Cd-Rom!\n"
 "\n"
-"Ubacite va� CD ozna�en sa \"%s\" u pogon i pritisnite OK kada ste spremni.\n"
+"Ubacite va� CD ozna�en sa \"%s\" u pogon i pritisnite \"U redu\" kada ste "
+"spremni.\n"
 "Ukoliko ga nemate pritisnite  Poni�ti."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Gre�ka pri instalaciji paketa:"
 
@@ -4579,34 +4113,21 @@ msgstr "Gre�ka pri instalaciji paketa:"
 msgid "An error occurred"
 msgstr "Xm,pojavila se  gre�ka"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "IZaberite koji jezik �elite da korisitite:"
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr "Mo�ete izabrati drugi jezik koji �e biti dostupan posle instalacije "
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Sve"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "LIcencirani ugovor"
 
-#: ../../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"
@@ -4660,7 +4181,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"
@@ -4697,7 +4218,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"
@@ -4718,13 +4239,13 @@ msgid ""
 msgstr ""
 "Upoznavanje\n"
 "\n"
-"Operativni sistem i druge komponente dostupne u Linux-Mandrake "
+"Operativni sistem i druge komponente dostupne u Mandrake Linux "
 "distribuciji \n"
 "na dalje �e biti zvane \"Softverski Proizvodi\" . Softverski proizvodi "
 "uklju�uju, ali nisu i \n"
 "ograni�eni na, skup programa, metoda, pravila i dokumentaciju koja je "
 "vezanaza operativni \n"
-"sistem i druge komponente Linux-Mandrake distribucije.\n"
+"sistem i druge komponente Mandrake Linux distribucije.\n"
 "\n"
 "\n"
 "1. Licencni ugovor\n"
@@ -4776,7 +4297,7 @@ msgstr ""
 "proizilaze \n"
 "iz upotrebe ili nemogu�nosti kori��enja Softverskih Komponenti ili koje "
 "proizilaze download-ovanih softverskih komponenti \n"
-"bilo kog Linux-Mandrake sajta koji su zabranjeni ili ograni�eni u nekim "
+"bilo kog Mandrake Linux sajta koji su zabranjeni ili ograni�eni u nekim "
 "zemljama po lokalnim zakonima.\n"
 "Ova ograni�ena prava se primenjuju, ali nisu i ograni�ena na,kriptografske "
 "komponente \n"
@@ -4812,7 +4333,7 @@ msgstr ""
 "MandrakeSoft S.A. je rezervisao svoja prava na modifikovanje ili adaptaciju "
 "SoftverskihProizvoda, kako za celinu tako i za \n"
 "delove, za sve sve svrhe i sve upotrebe.\n"
-"\"Mandrake\", \"Linux-Mandrake\" i pridru�eni logotipi i oznake MandrakeSoft "
+"\"Mandrake\", \"Mandrake Linux\" i pridru�eni logotipi i oznake MandrakeSoft "
 "S.A.  \n"
 "\n"
 "\n"
@@ -4830,103 +4351,99 @@ msgstr ""
 "Za bilo koje pitanje koje je vezano za ovaj dokument, kontaktirajte  "
 "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 "Tastatura"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
 msgstr "Koji  raspored tastature �elite ?"
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
 msgstr "Ovde je predstavljena cela lista dostupnih tastatura"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Instalacione klase"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
 msgstr "Koju  instalacionu klasu birate ?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
 msgstr "Instalacija/A�uriranje"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
 msgstr "Da li je ovo instalacija ili a�uriranje ?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Preporu�eno"
 
-#: ../../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 "A�uriranje"
 
-#: ../../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 "Izaberite tip mi�a"
 
-#: ../../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 za mi�a"
 
-#: ../../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 "Izaberite na koji serijski port je va� mi� priklju�en."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "Emulacija tastera"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "Emulacija 2 tastera"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "Emulaci�a 3 tastera"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Konfiguri�em PCMCIA kartice..."
 
-#: ../../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 "Konfiguracija  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 "nema dostupnih particija"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "Skeniranje particija za pronala�enje ta�ke montiranja"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "Izaberite ta�ke montiranja"
 
-#: ../../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"
@@ -4942,7 +4459,7 @@ msgstr ""
 "Drugo re�enje je da se DrakX onemogu�i da modufikuje tabelu particija.\n"
 "(gre�ka je %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!"
@@ -4950,77 +4467,118 @@ msgstr ""
 "DiskDrake ne mo�e da ispravno pro�ita tabelu particija.\n"
 "Dalji nastavak ide na va� rizik !"
 
-#: ../../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 ""
+"Nema slobodnog prostora za 1MB bootstrap! Instalacija gje se nastaviti, ali "
+"da bi podigli va�sistem, moragjete da kreirate bootstrap particiju u "
+"DiskDrake-u"
+
+#: ../../install_steps_interactive.pm_.c:349
+msgid "No root partition found to perform an upgrade"
+msgstr "Nije root particije potrebne za a�uriranje"
+
+#: ../../install_steps_interactive.pm_.c:350
 msgid "Root Partition"
 msgstr "Root particija"
 
-#: ../../install_steps_interactive.pm_.c:362
+#: ../../install_steps_interactive.pm_.c:351
 msgid "What is the root partition (/) of your system?"
 msgstr "Na kojoj particiji je root particija (/) va�eg 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 "Treba da resetujete ma�inu za primenu izmena u tabeli particija"
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
 msgstr "Izaberi particije za formatiranje"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "Proveri lo�e blokove ?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Formatiranje particiju"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Kreiranje i formatiranje datoteke %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Nema dovoljno swap-a da zavr�i instalaciju, dodajte jo� swap-a"
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "Tra�im pakete"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
 msgstr "Tra�im pakete za a�uriranje..."
 
-#: ../../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 "Va� sistem nema dovoljno mesta za instalaciju ili a�uriranje (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Kompletna (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimalna (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Preporu�ena (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Izbor po �elji"
 
-#: ../../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 ""
+"Molim Vas da izaberete u�itavanje ili snimanje selekcije paketa na disketu.\n"
+"Format koji se koristi je isti kao i kod  auto_install generisanih disketa."
+
+#: ../../install_steps_interactive.pm_.c:525
+msgid "Load from floppy"
+msgstr "U�itaj sa diskete"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "U�itavam sa diskete"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "Odabir paketa"
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm_.c:532
+msgid "Insert a floppy containing package selection"
+msgstr "Ubacite disketu koja sadr�i selekciju paketa"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Snimi na disketu"
+
+#: ../../install_steps_interactive.pm_.c:605
+msgid "Selected size is larger than available space"
+msgstr "Selektovana veli�ina je vegja od slobodnog prostora"
+
+#: ../../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 +4588,12 @@ msgstr ""
 "Ukoliko nemate nijedan CD, kliknite na  Cancel.\n"
 "Ako vam nedostaju  samo neki CD-ovi , deselektujte ix, a onda kliknite na Ok."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ozna�en kao \"%s"
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5044,11 +4602,21 @@ msgstr ""
 "Instaliram pakete %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
 msgstr "Postinstalaciona konfiguracija"
 
-#: ../../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 "Ubacite Boot disketu u ure�aj %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Ubacite Update Modules disketu u ure�aj %s"
+
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -5104,93 +4672,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 "Izaberite mirror sa kog �ete skinuti pakete"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Kantaktirajte mirror za listu mogu�ih paketa"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
 msgstr "Izaberite pakete za instalaciju"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Koja je va�a vremenska zona ?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "Da li je va� sistemski (BIOS) �asovnik pode�en na GMT ?"
+#: ../../install_steps_interactive.pm_.c:813
+msgid "Hardware clock set to GMT"
+msgstr "Va� sistemski (BIOS) �asovnik je pode�en na GMT"
+
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr "Automatska sinhronizacija vremena (preko NTP-a)"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "NTP Server"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
 msgstr "Udaljeni CUPS server"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Bez �tampa�a"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Sa�etak"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Mi�"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../../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 "�tampa�"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "ISDN kartica"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Zvu�na kartica"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "TV katica"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Koji sistem za �tampanje �elite da koristite ?"
+#: ../../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 "Lokalne datoteke"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Unesi root lozinku"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Bez lozinke"
 
-#: ../../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 "Ova lozinka je suvi�e jednostavna (treba da ima bar %d znakova)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Koristi NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autentifikacija"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "�ute stranice"
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "LDAP Autentifikacija"
+
+#: ../../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 Server"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
-msgstr "Autentifikacija NIS"
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
+msgstr "NIS Autentifikacija"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS Domen"
 
-#: ../../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 "
@@ -5211,24 +4819,24 @@ msgstr ""
 "od normalnog startera. Ovo je korisno ako ne �elite da instalirate\n"
 "SILO(ili grub) na va� sistem, ako drugi operativni sistem ukloni SILO, ili "
 "SILO ne\n"
-"radi sa va�im hardverom. Startni disk mo�ete koristiti sa Linux Mandrake\n"
+"radi sa va�im hardverom. Startni disk mo�ete koristiti sa Mandrake Linux\n"
 "'diskom za spasavanje', �to olak�ava oporavak u slu�aju te�e havarije.\n"
 "Ukoliko �elite da kreirate startnu disketu za va� sistemubacite disketu u "
 "pogon i pritisnite \"Da\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Prvi flopi/disketni ure�aj "
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Drugi flopi/disketni ure�aj"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Presko�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 "
@@ -5245,37 +4853,49 @@ msgstr ""
 "od normalnog startera. Ovo je korisno ako ne �elite da instalirate\n"
 "LILO(ili grub) na va� sistem, ako drugi operativni sistem ukloni LILO, ili "
 "LILO ne\n"
-"radi sa va�im hardverom. Startni disk mo�ete koristiti sa Linux Mandrake\n"
+"radi sa va�im hardverom. Startni disk mo�ete koristiti sa Mandrake Linux\n"
 "'diskom za spasavanje', �to olak�ava oporavak u slu�aju te�e havarije.\n"
 "Da li biste da kreirate startnu disketu za va� sistem?"
 
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "Ti malera, nema diskete"
 
-#: ../../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 ""
 "Izabrerite disketni ure�aj koji �ete koristiti  za kreiranje starne diskete"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Ubacite praznu disketu u ure�aj %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Kreiram startni disk..."
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "Pripremam starter..."
 
-#: ../../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 ""
+"Po�to izgleda da imate staromodnu ili nepoznatu \n"
+" ma�inu, yaboot starter negje raditi kod vas.\n"
+"Instalacija gje biti nastavljena, ali gjete morati da\n"
+" BootX da bi podigli sistem"
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "Da li �elite da koristite 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?"
@@ -5283,16 +4903,22 @@ msgstr ""
 "Gre�ka pri instalaciji aboot-a, \n"
 "Da li da probam da instaliram �ak ako to vodi uni�tenju prve particije?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+#, fuzzy
+msgid "Installing bootloader"
+msgstr "Instaliraj starter"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Instalacija startera neuspela. Gre�ka je:"
 
-#: ../../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 ""
@@ -5303,38 +4929,34 @@ msgstr ""
 " Onda ukucajte: shut-down\n"
 "Kada slede�i put startujete ma�inu trebali bi da vidite staterov prompt."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Mala"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Srednja"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Velika"
 
-#: ../../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 "Izaberite sigurnosni nivo"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"Da li �elite da kreirate autoinstalacioni flopi za replikaciju linux-a ?"
-
-#: ../../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 "Ubacite praznu disketu u ure�aj %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 "Kreiram auto instalacioni flopi"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5344,33 +4966,33 @@ msgstr ""
 "\n"
 "Da li stvarno �elite da zavr�ite ?"
 
-#: ../../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 ""
 "�estitamo, instalacija je zavr�ena.\n"
 "Izvadite disketu iz drajva i pritisnite <Enter> da se ra�unar resetuje.\n"
 "\n"
 "Za informacije o popravkama koje su na raspolaganju za ovo izdanje\n"
-"Linux Mandrake Linux-a, pro�itajte deo 'Errata' koji mo�ete na�i na\n"
-"http://www.linux-mandrake.com/.\n"
+"Mandrake Linux Linux-a, pro�itajte deo 'Errata' koji mo�ete na�i na\n"
+"http://www.mandrakelinux.com/.\n"
 "\n"
 "Informacije o konfigurisanju va�eg sistema mo�ete na�i u post-instalacionom\n"
-"poglavlju zvani�nog Linux Mandrake 'Vodi�a za korisnike'."
+"poglavlju zvani�nog Mandrake Linux 'Vodi�a za korisnike'."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "Kreiraj auto instalacionu disketu"
 
-#: ../../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"
@@ -5384,41 +5006,58 @@ msgstr ""
 "\n"
 "Mo�da volite da ponovite instalaciju.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automatski"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Ponavljanje"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Sa�uvaj selekciju paketa"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake Instalacija %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux Instalacija %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> kret. izme�u elemenata | <Space> izbor | <F12> slede�i ekran"
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "nedostaje kdesu"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "Izaberite akciju"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Napredno"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Samo momenat..."
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Pro�iri stablo"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Skupi stablo"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Birajte: ravno ili grupno sortirano"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -5444,267 +5083,288 @@ msgstr "Va� izbor ? (po default-u %s) "
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Va� izbor ? (po default-u %s unesi `none' za nijedan) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "�e�ki (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 "Nema�ki"
 
-#: ../../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 "�panski"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Finski"
 
-#: ../../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 "Francuski"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norve�ki"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "�vedski"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "UK tastatura"
 
-#: ../../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 tastatura"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "Albanski"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Jermenski (stari)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Jermenski (typewriter)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Jermenski (fonetski)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbejdzan  (latinica)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbejdzanski (�irilica)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belgijski"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazilski (ABNT-2)"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Beloruski"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "�vajcarski (Nema�ki raspored)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "�vajcarski (Francuski  raspored)"
 
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "�e�ki (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "�e�ki (Programeri)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Nema�ki (bez mrtvih tastera)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Danski"
 
-#: ../../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�ki)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estonski"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Gruzijski (\"Ruski\" raspored)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Gruzijski (\"Latini�ni\" rapored)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Gr�ki"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Ma�arski"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Jevrejski"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Jevrejski (Fonetski)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iranski"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Islandski"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Italijanski"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japanski 106 tastera"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Korejanska tastatura"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latino-Ameri�ki"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Makedonski"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Danski"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litvanski AZERTY(stari)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litvanski AZERTY(novi)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litvanski \"number row\"QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litvanski \"fonetski\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "Lokacija"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Makedonski"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Danski"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Poljski (qwerty raspored)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Poljski (qwertz raspored)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanadski (Kvebek)"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "Rumunski (qwertz)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "Rumunski (qwerty)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "Ruski (Javerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "�vedski"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Slovena�ki"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slova�ki (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slova�ki (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Slova�ki (Programerski)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbejdzanski (�irilica)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr " Thai tastatura"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr " Thai tastatura"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turski (tradicionalni \"F\" model)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turski (moderni \"Q\" model)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "US tastatura (internacionalna)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vijetnamski  \"number row\"QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "Srpski (latini�ni/�irili�ni raspored)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Kru�no montiranje  %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Ukloni prvo logi�ke volumene\n"
 
@@ -5816,170 +5476,226 @@ msgstr "nijedan"
 msgid "No mouse"
 msgstr "Nema mi�a"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Molim Vas da testirate mi�a"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "Da bi mogli da aktivirate mi�a"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "pomerite to�ki� !"
+
+#: ../../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 "Kraj"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Slede�i  ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- Prethodni"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "Da li je ovo ispravno ?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Konfiguracija interneta"
-
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Da li ho�ete da se konektujete na internet sada?"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Konektuj na internet"
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Testiranje konekcije..."
+#: ../../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 ""
+"Naj�e��i na�in za konekciju sa adsl je pppoe.\n"
+"Me�utim, postoje konekcije koje koriste pptp i neke koje koriste dhcp.\n"
+"Ukoliko ne znate koja je, izaberite 'koristi pppoe'"
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
-msgid "The system is now connected to Internet."
-msgstr "Sistem je trenutno konektovan na Internet"
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
+msgstr ""
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Iz sigurnosnih razloga, on �e sada biti diskonektovan."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "koristi dhcpd"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
-msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
-msgstr ""
-"Izgleda da sistem nije konektovan na Internet.\n"
-"Probajte da promenite konfiguraciju."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "koristi pppoe"
 
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Pode�avanje mre�e"
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "koristi 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 Konfiguracija"
+#: ../../network/ethernet.pm_.c:37
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpcd"
+msgstr "Kog dhcp klijenta �elite da koristite ?Postavljeni je 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 ""
-"Izaberite svog provajdera.\n"
-" Ukoliko nije na listi, izaberite Unlisted"
+"Nije detektovana nijedna mre�na kartica.\n"
+"Ne mogu da podesim ovaj tip konekcije."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Konfiguracija Internet konekcije"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "Izaberite mre�ni interfejs"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Molim VAS da popunite ili ozna�ite polja ispod"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr ""
+"Izaberite mre�ni adapter koji �elite da koristite za konekciju na internet"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "IRQ kartice"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "Nije prona�ena mre�na kartica"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "(DMA) kartice"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Pode�avanje mre�e"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr " IO kartice"
+#: ../../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 ""
+"Molim unesite  ime hosta ukoiko ga znate\n"
+"'Neki DHCP serveri zahtevaju ime hosta da bi radili.\n"
+"Va�e ime hosta treba da bude puno ime kao npr.\n"
+"``mybox.mylab.myco.com''."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr " IO_0 kartice"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "Ime hosta:"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "IO_1 kartice"
+#: ../../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 "�arobnjak za pode�avanje mre�e"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Va� li�ni broj telefona"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Eksterni ISDN modem"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Ime provajdera (npr. provider.net)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Interna  ISDN kartica"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Broj telefona provajdera"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Kakva je vrsta va�e ISDN kenekcije ?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Provajderov 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 ""
+"Koju ISDN konfiguraciju vi�e preferirate?\n"
+"\n"
+"* Stara kofiguracja koristi isdn4net. Ona sadr�i mogjne alatke, ali je\n"
+"  problemati�na za pode�avanje pogotovo za po�etnike, i nije uobi�ajena.\n"
+"\n"
+"* Nova konfiguracija je jednostavnija za razumeti, standardnija,\n"
+"  ali sa manje opcija i alata.\n"
+"\n"
+"Mi preporu�ujemo lak�u (jednostavniju) konfiguraciju.\n"
+"\n"
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "Provajderov dns 2"
+#: ../../network/isdn.pm_.c:54
+msgid "New configuration (isdn-light)"
+msgstr "Nova konfiguracija (isdn-light)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Mod za biranje"
+#: ../../network/isdn.pm_.c:54
+msgid "Old configuration (isdn4net)"
+msgstr "Stara konfiguracija (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Logovanje za ra�un (korisni�ko ime)"
+#: ../../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 Konfiguracija"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Lozinka za ra�un"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"Izaberite svog provajdera.\n"
+" Ukoliko nije na listi, izaberite Unlisted"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Evropa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Startni(Boot) protokol"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Evropa (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 "Ostatak sveta"
 
-#: ../../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 ""
 "Ostatak sveta \n"
 " bez D-kanala (zakupljene linije)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Koji protokol �elite da koristite ?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Kakvu vrstu kartice imate?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Ne znam"
 
-#: ../../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"
@@ -5992,19 +5708,19 @@ msgstr ""
 "\n"
 "Ukoliko imate PCMCIA karticu, morate znati  irq i  io za va�u karticu.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Prekini"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Nastavi"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Koja je va�a ISDN kartica ?"
 
-#: ../../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."
@@ -6012,109 +5728,59 @@ msgstr ""
 "Detektovana je ISDN PCI kartica, nepoznatog tipa. Izaberite jednu PCI "
 "karticu na slede�em ekranu."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Nije prona�ena ISDN PCI kartica.Izaberite jednu na slede�em ekranu."
 
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Nije detektovana nijedna mre�na kartica.\n"
-"Ne mogu da podesim ovaj tip konekcije."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "Izaberite mre�ni interfejs"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Izaberite mre�ni adapter koji �elite da koristite za konekciju na internet"
-
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Mre�ni interfejs"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Da li se sla�ete?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Sadam treba da se restartuje mre�ni interfejs:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ADSL konfiguracija"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Da li �elite da startujete konektovanje pri startanju sistema ?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Izaberite serijski port  na koji je modem povezan."
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Dialup opcije"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Ime konekcije"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Broj telefona"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "ID za logovanje"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autentifikacija"
+#: ../../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 "Bazirano na skripti"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Bazirano na terminalu"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Ime domena"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "Prvi DNS Server (opcija)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "Drugi DNS Server (opcija)"
 
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"Sada treba da se restartuje mre�ni ure�aj $netc->{NET_DEVICE}. Da li se "
-"sla�ete ?"
-
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6122,7 +5788,7 @@ msgstr ""
 "\n"
 "Mo�ete se diskonektovati ili rekonfigurisati konekciju."
 
-#: ../../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."
@@ -6130,11 +5796,11 @@ msgstr ""
 "\n"
 "Podesi internet konfiguraciju"
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Trenutno ste konektovani na Internet"
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -6142,99 +5808,56 @@ msgstr ""
 "\n"
 "Sada se mo�ete konektovati na Internet ili rekonfigurisati konekciju"
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Trenutno niste konektovani na Internet"
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Konektuj na Internet"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Diskonektuj sa Interneta"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Podesi mre�nu konfiguraciju(LAN ili Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Internet konekcija i  konfiguracija"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "�arobnjak za pode�avanje mre�e"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Eksterni ISDN modem"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Interna  ISDN kartica"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Kakva je vrsta va�e ISDN kenekcije ?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Konektuj na 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 ""
-"Naj�e��i na�in za konekciju sa adsl je pppoe.\n"
-"Me�utim, postoje konekcije koje koriste pptp i neke koje koriste dhcp.\n"
-"Ukoliko ne znate koja je, izaberite 'koristi pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "koristi dhcpd"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "koristi pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "koristi 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 "Sada treba da se restartuje mre�ni ure�aj  %s. Da li se sla�ete ?"
-
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
-msgstr "Kog dhcp klijenta �elite da koristite ?Postavljeni je dhcpcd"
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "Pode�avanje mre�e"
+msgid "We are now going to configure the %s connection."
+msgstr "Sada treba da podesimo %s konekciju."
 
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Da li ho�ete da restartujete mre�e?"
-
-#: ../../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 ""
-"Pojavio se problem tokom restartovanja mre�e?\n"
-"%s"
+"\n"
+"\n"
+"\n"
+"Sada treba da podesimo %s konekciju.\n"
+"\n"
+"\n"
+"Pritisnite \"U redu\" za nastavak."
+
+#: ../../network/netconnect.pm_.c:129 ../../network/netconnect.pm_.c:243
+#: ../../network/netconnect.pm_.c:255 ../../network/tools.pm_.c:56
+msgid "Network Configuration"
+msgstr "Pode�avanje mre�e"
 
-#: ../../netconnect.pm_.c:935
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6246,7 +5869,7 @@ msgstr ""
 "Kliknite na  OK  zadrd�ali konfiguraciju Network/Internet konekcije, ili "
 "cancel da bi ponovo uradili kofiguraciju.\n"
 
-#: ../../netconnect.pm_.c:962
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6258,104 +5881,120 @@ msgstr ""
 "Sada treba da konfiguri�emo va�u internet/mre�nu konekciju.\n"
 "Ukoliko ne �elite auto detekciju, deselektujte opciju.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "Izaberite profil za konfigurisanje"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "Koristi auto detekciju"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Detektujem  ure�aje..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Normalna modemska konekcija"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "Detektovano na portu %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "ISDN konekcija"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "detektovano %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (ili ADSL) konekcija"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+msgid "ADSL connection"
+msgstr "ADSL konekcija"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "Detektovano na interfejsu %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Kablovska konekcija"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "Detektovana je kablovska konekcija "
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "LAN konekcija"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "detektovana mre�na kartica(e)"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Kako �elite da se konektujete na internet ?"
+#: ../../network/netconnect.pm_.c:190
+msgid "Choose the connection you want to configure"
+msgstr "Izaberite tip konekcije koji �elite da koristite"
 
-#: ../../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 ""
-"�estitamo, mre�na i internet konfiguracija je zavr�ena.\n"
+"Vi ste podesili vi�e na�ina za konektovanje na Internet.\n"
+"Izaberite jedan od njih koji �elite da koristite.\n"
 "\n"
-"Konfiguracija se sada mo�e primeniti na sistem."
 
-#: ../../netconnect.pm_.c:1007
-msgid ""
-"After that is done, we recommend you to restart your X\n"
-"environnement to avoid hostname changing problem."
-msgstr ""
-"Kada se to uradi, trebali bi da restartujete X\n"
-"okru�enje da bi izbegli probleme sa promenom hostname-a."
+#: ../../network/netconnect.pm_.c:215
+msgid "Internet connection"
+msgstr "Internet konekcija"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "Nije prona�ena mre�na kartica"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Da li �elite da startujete konektovanje pri startanju sistema ?"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
 msgstr "Pode�avanje mre�e"
 
-#: ../../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 ""
-"Molim unesite  ime hosta ukoiko ga znate\n"
-"'Neki DHCP serveri zahtevaju ime hosta da bi radili.\n"
-"Va�e ime hosta treba da bude puno ime kao npr.\n"
-"``mybox.mylab.myco.com''."
+"Pojavio se problem tokom restartovanja mre�e?\n"
+"%s"
 
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "Ime hosta:"
+#: ../../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 ""
+"�estitamo, mre�na i internet konfiguracija je zavr�ena.\n"
+"\n"
+"Konfiguracija se sada mo�e primeniti na sistem.\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 ""
+"Kada se to uradi, trebali bi da restartujete X\n"
+"okru�enje da bi izbegli probleme sa promenom hostname-a."
+
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6367,7 +6006,7 @@ msgstr ""
 "Samo prihvaitite da bi postavku ostavili istom.\n"
 "Izmena polja koje vidite �e poni�titi postoje�u konfiguraciju."
 
-#: ../../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"
@@ -6377,38 +6016,38 @@ msgstr ""
 "Svaka stavka treba de bude tavka treba da bude uneta kao\n"
 "IP adresa (na primer, 123.45.67.89)."
 
-#: ../../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 "Pode�avanje mre�nog ure�aja %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr "(drajver $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr "(drajver %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 adresa"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "Mre�na maska"
 
-#: ../../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 "Automatski 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 adresa treba da bude u formatu 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"
@@ -6420,43 +6059,149 @@ msgstr ""
 "kao na pr.  ``mybox.mylab.myco.com''.\n"
 "Ako nemate dodatnih 'nameserver'-a, ostavite ta polja prazna."
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNS server"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Gateway ure�aj"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Pode�avanje proksija"
 
-#: ../../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 treba da bude http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Proxy treba da bude ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Konfiguracija interneta"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Da li ho�ete da se konektujete na internet sada?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Testiranje konekcije..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Sistem je trenutno konektovan na Internet"
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Iz sigurnosnih razloga, on �e sada biti diskonektovan."
+
+#: ../../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 ""
+"Izgleda da sistem nije konektovan na Internet.\n"
+"Probajte da promenite konfiguraciju."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Konfiguracija Internet konekcije"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Molim VAS da popunite ili ozna�ite polja ispod"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "IRQ kartice"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "(DMA) kartice"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr " IO kartice"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr " IO_0 kartice"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "IO_1 kartice"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Va� li�ni broj telefona"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Ime provajdera (npr. provider.net)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Broj telefona provajdera"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Provajderov dns 1 (opciono)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Provajderov dns 2 (opciono)"
+
+#: ../../network/tools.pm_.c:88
+#, fuzzy
+msgid "Choose your country"
+msgstr "Izaberi tastaturu"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Mod za biranje"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+msgid "Connection speed"
+msgstr "Brzina konekcije "
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Vreme konekcije: "
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Logovanje za ra�un (korisni�ko ime)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Lozinka za ra�un"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
 msgstr "Extended particija nije podr�ana na ovoj platformi"
 
-#: ../../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 "
@@ -6466,26 +6211,21 @@ msgstr ""
 "Jedino re�enje je da pomerite primarnu particiju tako da praznina bude\n"
 "do extended particija"
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Gre�ka kod otvaranja datoteka %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Otvaranje iz datoteke %s nije uspelo: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Lo�e backup-ovana datoteka"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Gre�ka kod unosa u datoteka %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"
@@ -6515,49 +6255,215 @@ msgstr "lepo"
 msgid "maybe"
 msgstr "mo�da"
 
-#: ../../printer.pm_.c:20
+#: ../../printer.pm_.c:23
+msgid "CUPS - Common Unix Printing System"
+msgstr "CUPS - Op�ti Unix-ov sistem za �tampanje"
+
+#: ../../printer.pm_.c:24
+msgid "LPRng - LPR New Generation"
+msgstr "LPRng - LPR Nove Generacije"
+
+#: ../../printer.pm_.c:25
+msgid "LPD - Line Printer Daemon"
+msgstr "LPD - Line Printer Demon"
+
+#: ../../printer.pm_.c:26
+msgid "PDQ - Print, Don't Queue"
+msgstr "PDQ - �tampaj, nemoj da pamti�"
+
+#: ../../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 "Lokalni  �tampa�"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Udaljeni �tampa�"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
+#: ../../printer.pm_.c:42
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Udaljeni CUPS server"
+
+#: ../../printer.pm_.c:43
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Udaljeni lpd server"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Mre�ni �tampa� (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 "Server �tampa�a:"
 
-#: ../../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 "Ure�aj za �tampa� URI"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printer.pm_.c:48
+#, fuzzy
+msgid "Pipe job into a command"
+msgstr "Ubaci u komandu"
+
+#: ../../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 "Izbor povezanosti �tampa�a"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Kako je �tampa� povezan?"
+
+#: ../../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 ""
+"Sa udaljenim CUPS serverom, ne morate da kofiguri�ete\n"
+"ovde ni jedan �tampa�; �tampa�i �e biti automatski detektovani.\n"
+"osim ako imate server na drugoj mre�i; ako je to\n"
+"slu�aj, morate dati IP adresu  CUPS servera\n"
+"a opciono i broj porta."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Nijedan"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+#, fuzzy
+msgid "Choose a default printer!"
+msgstr "Izaberite default (osnovnog) korisnika:"
+
+#: ../../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 "Zatvori"
+
+#: ../../printerdrake.pm_.c:125
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Udaljeni �tampa�"
+
+#: ../../printerdrake.pm_.c:129
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP adresa treba da bude u formatu 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Broj porta bi trebao da bude numeri�ki broj"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+#, fuzzy
+msgid "Default printer"
+msgstr "Lokalni  �tampa�"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "SMB server IP:"
+
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Konfiguracija stila startanja"
+
+#: ../../printerdrake.pm_.c:217
+#, fuzzy
+msgid "Detecting devices ..."
+msgstr "Detektujem  ure�aje..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Testiranje portova"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "�tampa�, model \"%s\", je detektovan na "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Lokalni ure�aj za �tampa�"
 
-#: ../../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"
@@ -6565,38 +6471,59 @@ msgstr ""
 "Na koji ure�aj je va� �tampa� povezan \n"
 "(/dev/lp0 odgovara LPT1: u DOS-u)?\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Ure�aj za �tampa�:"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr "Nedostaje UreKjaj/ime datoteke!"
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+#, fuzzy
+msgid "Reading printer database ..."
+msgstr "U�itavam CUPS bazu podataka o drajverima..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "Opcije za udaljeni 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 ""
 "Da biste mogli da koristite udaljeni red poslova\n"
 "za �tampu morate navesti ime hosta na kome je server za �tampa�\n"
-"i ime reda poslova za �tampu na tom serveru u koji �e se sme�tati\n"
-"sve �to se po�alje na �tampa�."
+"i ime reda poslova za �tampu na tom serveru."
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:316
+#, fuzzy
+msgid "Remote host name"
 msgstr "Ime udaljenog host-a:"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Udaljeni red:"
+#: ../../printerdrake.pm_.c:317
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Udaljeni �tampa�"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:320
+msgid "Remote host name missing!"
+msgstr "Nedostaje ime udaljenog host-a!"
+
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Nedostaje ime udaljenog host-a!"
+
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT)  opcije �tampa�a"
 
-#: ../../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"
@@ -6609,29 +6536,37 @@ msgstr ""
 "IP adresu �tampa�evog servera; deljeno ime �tampa�a kome pristupate,\n"
 "kao i potrebna korisni�ka imena i lozinke."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "SMB server  host:"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "SMB server IP:"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
 msgstr "Deljeno (zajedni�ko)  ime :"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Radna grupa(Workgroup):"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr "Morate dati ili ime servera ili njegov IP!"
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr "Nedostaje deljeno ime za Samba-u!"
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
 msgstr "NetWare opcije �tampa�a"
 
-#: ../../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."
@@ -6641,59 +6576,229 @@ msgstr ""
 "te  ime 'reda' �tampa�a kome pristupate,\n"
 "kao i potrebna korisni�ka imena i lozinke."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Server �tampa�a:"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Print Queue ime:"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr "Nedostaje ime NCP servera!"
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr "Nedostaje ime za NCP red!"
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Opcije prklju�nog  �tampa�a"
 
-#: ../../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 ""
 "Da bi �tampali na prklju�nom �tampa�u, morate obezbediti\n"
 "ime hosta za �tampa� i eventualno broj porta."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:533
+#, fuzzy
+msgid "Printer host name"
 msgstr "Ime hosta za �tampa�"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Port"
+#: ../../printerdrake.pm_.c:537
+msgid "Printer host name missing!"
+msgstr "Nedostaje ime hosta!"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Mo�ete da odredite URI direktno radi pristupa �tampa�u sa CUPS-a"
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Ure�aj za �tampa� URI"
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
-msgstr "Koju vrstu �tampa�a imate?"
+#: ../../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 ""
+"Mo�ete direktno odrediti URI za pristup �tampa�u. URI mora ispunjavati ili "
+"CUPS ili Foomatic specifikacije. Zapamtite da nisu svi URI tipovi podr�ani."
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "Da li �elite da testirate �tampa�?"
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr "Morate uneti validan URI!"
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../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 ""
+"Svaki �tampa� mora da ima ime (na primer lp).\n"
+"Polja za Opis i Lokaciju ne moraju biti \n"
+"popunjena. To su samo korisne napomene za korisnike."
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Ime �tampa�a"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Opis"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Lokacija"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "U�itavam CUPS bazu podataka o drajverima..."
+
+#: ../../printerdrake.pm_.c:793
+msgid "Printer model selection"
+msgstr "Selekcija modela �tampa�a"
+
+#: ../../printerdrake.pm_.c:794
+msgid "Which printer model do you have?"
+msgstr "Koju model �tampa�a imate?"
+
+#: ../../printerdrake.pm_.c:866
+#, fuzzy
+msgid "OKI winprinter configuration"
+msgstr "Konfiguracija interneta"
+
+#: ../../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 "Konfiguracija interneta"
+
+#: ../../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 "Port mora biti brojna oznaka!"
+
+#: ../../printerdrake.pm_.c:1094
+#, fuzzy, c-format
+msgid "Option %s must be a number!"
+msgstr "Port mora biti brojna oznaka!"
+
+#: ../../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 "Da li �elite da i�tampate test stranicu?"
+
+#: ../../printerdrake.pm_.c:1152
+#, fuzzy
+msgid "Test pages"
+msgstr "Testiranje portova"
+
+#: ../../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 "�tampa�"
+
+#: ../../printerdrake.pm_.c:1161
+#, fuzzy
+msgid "Standard test page"
+msgstr "Standardni"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1167
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "�tampam test stran(ice)u..."
+
+#: ../../printerdrake.pm_.c:1169
+#, fuzzy
+msgid "Photo test page"
+msgstr "�tampam test stran(ice)u..."
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "�tampam test stran(ice)u..."
 
-#: ../../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 ""
 "Test stran(ice)a je poslana �tampa� demonu.\n"
 "To mo�e dovesti do malog odlaganja starta �tampa�a.\n"
@@ -6702,237 +6807,599 @@ msgstr ""
 "\n"
 "Da li radi OK ?"
 
-#: ../../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 ""
 "Test stran(ice)a je poslana �tampa� demonu.\n"
 "To mo�e dovesti do malog odlaganja starta �tampa�a.\n"
 "Da li radi OK ?"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Da, i�tampaj ASCII test stranicu"
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Da, i�tampaj PostScript test stranicu"
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+#, fuzzy
+msgid "Raw printer"
+msgstr "Bez �tampa�a"
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Da, i�tampaj obe test stranice"
+#: ../../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 "Pode�avanje �tampa�a"
+#: ../../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 "Odstupam od mre�e"
+
+#: ../../printerdrake.pm_.c:1294
+#, fuzzy
+msgid "Print option list"
 msgstr "Opcije �tampa�a"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Veli�ina papira"
+#: ../../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 "Izbaci papir nakon �tampanja ?"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Konfiguracija interneta"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Uniprint  drajver -opcije"
+#: ../../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 "Opcija - Broj boja"
+#: ../../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 "�tampaj tekst kao 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 "Popraviti  'efekat stepenica' u tekstu?"
+#: ../../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 "Broj stranica po izlaznim stranicama"
+#: ../../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 "Desna/leva margina u ta�kama (1/72 deo in�a)"
+#: ../../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 "Vrh/dno margina u ta�kama (1/72 deo in�a)"
+#: ../../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 "Dodatne GhostScript opcije"
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Dodatne Tekst opcije"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Obrnut redosled stranica"
+#: ../../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 "Da li biste da podesite �tampa�?"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "Ime �tampa�a treba da sadr�i samo slova, brojeve i 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 ""
-"Ovo su postavljne opcije.\n"
-"Mo�ete dodati nove ili izmeniti stare."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "Pokre�em CUPS.."
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "Bez �tampa�a"
+
+#: ../../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 "U�itavam CUPS bazu podataka o drajverima..."
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "Izbor povezanosti �tampa�a"
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+#, fuzzy
+msgid "Configuration of a remote printer"
+msgstr "Pode�avanje �tampa�a"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Kako je �tampa� povezan?"
+#: ../../printerdrake.pm_.c:1432
+#, fuzzy
+msgid "Starting network ..."
+msgstr "Startujem konekciju..."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "Izaberi  konekciju udaljenih �tampa�a"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+#, fuzzy
+msgid "Configure the network now"
+msgstr "Podesi mre�u"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:1455
+#, fuzzy
+msgid "Network functionality not configured"
+msgstr "Monitor nije konfigurisan"
+
+#: ../../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 ""
-"Sa udaljenim CUPS serverom, ne morate da kofiguri�ete\n"
-"ovde ni jedan �tampa�; �tampa�i �e biti automatski detektovani.\n"
-"In Ukoliko se dvoumite, izaberite \"Udaljeni CUPS server\"."
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:1463
+#, fuzzy
+msgid "Go on without configuring the network"
+msgstr "Pode�avanje mre�e"
+
+#: ../../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 ""
-"Sa udaljenim CUPS serverom, ne morate da kofiguri�ete\n"
-"ovde ni jedan �tampa�; �tampa�i �e biti automatski detektovani.\n"
-"osim ako imate server na drugoj mre�i; ako je to\n"
-"slu�aj, morate dati IP adresu  CUPS servera\n"
-"a opciono i broj porta."
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "SMB server 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 "Broj porta bi trebao da bude numeri�ki broj"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "Koji sistem za �tampanje �elite da koristite ?"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Ukloni queue"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "Velika"
+
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoidna"
 
-#: ../../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"
-msgstr "Ime �tampa�a treba da sadr�i samo slova, brojeve i 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:1584
+#, fuzzy
+msgid "Starting the printing system at boot time"
+msgstr "Koji sistem za �tampanje �elite da koristite ?"
 
-#: ../../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 ""
-"Svaki  �tampa� mora da ima ime (npr. lp).\n"
-"Ostali parametri kao �to je opis ili njegova lokacija \n"
-"mogu biti definisani.Koje ime treba da bude iskori�teno za  ovaj �tampa� i\n"
-"kako je �tampa� povezan?"
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Ime �tampa�a"
+#: ../../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 "Opis"
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Lokacija"
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1727
+msgid "Select Printer Spooler"
+msgstr "Izaberite Spooler za �tampa�"
+
+#: ../../printerdrake.pm_.c:1728
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Koji sistem za �tampanje (spooler) �elite da koristite ?"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Podesi �tampa�"
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Opcije �tampa�a"
+
+#: ../../printerdrake.pm_.c:1815
+msgid "Preparing PrinterDrake ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1845
+msgid "Would you like to configure printing?"
+msgstr "Da li biste da podesite �tampa�?"
+
+#: ../../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 ""
-"Svaki 'red' za �tampu (u koji se sla�u poslovi za �tampanje) zahteva\n"
-"ime (obi�no lp) i 'spool' direktorijum koji uz to ide. Koje ime i "
-"direktorijum\n"
-"da koristim za ovaj red za �tampu i kako je  �tampa� povezan?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "Ime queue-a "
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Normalni Mod"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "'Spool direktorijum"
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Podrazumevano)"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "Konekcija �tampa�a"
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Udaljeni CUPS server"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Udaljeni CUPS server"
 
-#: ../../raid.pm_.c:33
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+msgid "Add printer"
+msgstr "Dodajte �tampa�"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+#, fuzzy
+msgid "Do you want to configure another printer?"
+msgstr "Da li ho�ete da testirate konfiguraciju?"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "Konfiguracija interneta"
+
+#: ../../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 konekcija"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+#, fuzzy
+msgid "Printer name, description, location"
+msgstr "Selekcija modela �tampa�a"
+
+#: ../../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 "�tampam test stran(ice)u..."
+
+#: ../../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 "Udaljeni �tampa�"
+
+#: ../../printerdrake.pm_.c:2071
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Udaljeni �tampa�"
+
+#: ../../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 "Da li ho�ete da restartujete mre�e?"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Udaljeni �tampa�"
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "Pode�avanje proksija"
+
+#: ../../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 ""
+"Dobrodo�li u alat za konfiguraciju proxy-ja.\n"
+"\n"
+"Ovde mo�ete da podesite va�e http i ftp proksije\n"
+"sa ili bez korisni�kog imena i lozinke\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 ""
+"Molim Vas da unesete http proxy informacije\n"
+"Ostavite polja praznima ukoliko ne �elite da koristetite proksi"
+
+#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
+msgid "URL"
+msgstr "URL"
+
+#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
+msgid "port"
+msgstr "Port"
+
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "Url treba da po�inje sa http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "Broj porta bi trebao da bude numeri�ka oznaka (broj)"
+
+#: ../../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 ""
+"Molim Vas da unesete informacije o ftp proxy-ju\n"
+"Polja ostavite praznima ukoliko ne �elite da koristite ftp proksi"
+
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "Url treba da po�inje sa '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 ""
+"Unesite proxy korisni�ko ime i lozinku, ukoliko postoje.\n"
+"Polja ostavite paznima ukoliko ne �elite da koristite korisni�ko ime/lozinku"
+
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "logovanje"
+
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "lozinka"
+
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "pomovo unesite lozinke"
+
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "Nepodudarnost lozinki. Probajte ponovo!"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Nije mogu�e dodati particiju na _formatiran_ RAID md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Nije mogu� unos u fajl $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Nije mogu� unos u fajl %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid neuspelo"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid neuspelo (mo�da nedostaje raidtools ?)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nema dovoljno particija za RAID nivo %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr ""
+msgstr "Startam ALSA (Advanced Linux Sound Architecture) sistem za zvuk"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron -  podesite period.komande"
 
-#: ../../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."
@@ -6941,7 +7408,7 @@ msgstr ""
 "Koristi se i za ga�enje ma�ine (radi i na desktop ma�inama) kada je baterija "
 "slaba"
 
-#: ../../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."
@@ -6950,7 +7417,7 @@ msgstr ""
 "optere�enost\n"
 "sistema mala."
 
-#: ../../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 "
@@ -6961,7 +7428,7 @@ msgstr ""
 "preriodi�no u zakazano vreme. vixie cron  dodaje opcije prostom UNIX cron,"
 "uklju�uju�i bolju  sigurnost i bolju podesivost."
 
-#: ../../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 "
@@ -6971,13 +7438,15 @@ msgstr ""
 "GPM daje podr�ku za mi�a za teksulano-bazirane aplikacije kao �to je\n"
 "Midnight Commander.Isto tako daje podr�ku za  pop-up menije na  konzoli."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
+"HardDrake starta ispitivanje haredvera, i po potrebi gje podesiti \n"
+"novi/izmenjeni hardver."
 
-#: ../../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."
@@ -6985,7 +7454,7 @@ msgstr ""
 "Apache je  WWW server. On se koristi da opslu�uje  HTML fajlove\n"
 "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 "
@@ -6999,13 +7468,15 @@ msgstr ""
 "elnet, ftp, rsh, i  rlogin.Isklju�uju�i njega, isklju�ujete i servise \n"
 "za koje je on odgovoran."
 
-#: ../../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 ""
+"Pokrenite filtriranje paketa za Linux kernel serije 2.2, da bi podesili\n"
+"firewall radi za�tite va�e ma�ine od mre�nih napada."
 
-#: ../../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"
@@ -7015,23 +7486,27 @@ msgstr ""
 "u  /etc/sysconfig/keyboard.Ovo se pode�ava koriste�i kbdconfig alatku.\n"
 "Treba da bude uklju�en na ve�inu ma�ina."
 
-#: ../../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 ""
+"Automatska regeneracija kernelovog zaglavlja u /boot zar\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 "Automatska detekcija i konfiguracija hardvera pri startanju sistema."
 
-#: ../../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 gje ponekad izvoditi razne zadatke tokom\n"
+"startanja sistema radi odr�avanja i pode�avanja sistema."
 
-#: ../../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)."
@@ -7039,13 +7514,15 @@ msgstr ""
 "lpd je print demon potreban  da bi  lpr radio dobro.To je \n"
 "u osnovi server koji arbitrira  print poslove �tampa�u(ima)."
 
-#: ../../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-ov Virtuelni Server, koristi se za izgradnju brzog i dostupnog\n"
+"servera."
 
-#: ../../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."
@@ -7053,7 +7530,7 @@ msgstr ""
 "Nazvan  (BIND) je Domain Name Server (DNS) koji se koristi za daje  \n"
 "host ime  IP adresi."
 
-#: ../../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."
@@ -7061,7 +7538,7 @@ msgstr ""
 "Montiranje i demontiranje svih Mre�nih fajl sistema(NFS), SMB (Lan\n"
 "Manager/Windows), i  NCP (NetWare) ta�aka montiranja. "
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -7070,7 +7547,7 @@ msgstr ""
 "start \n"
 "pri podizanju sistema."
 
-#: ../../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"
@@ -7080,7 +7557,7 @@ msgstr ""
 "Ovaj servis omogu�ava funkcionalnost NFS servera,koji se konfiguri�e preko \n"
 "/etc/exports datoteke."
 
-#: ../../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."
@@ -7088,17 +7565,19 @@ msgstr ""
 "NFS je popularni protokol za razmenu  fajlova preko TCP/IP mre�a.\n"
 "Ovaj servis omogu�ava funkcionalnost NFS  file locking funkcije"
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
+"Automatski uklju�uje numlock taster pod konzolom\n"
+"i u XFree pri startanju."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr ""
+msgstr "Podr�ka za OKI 4w i kompatibilne mu  win �tampa�e."
 
-#: ../../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 "
@@ -7109,7 +7588,7 @@ msgstr ""
 "Ne�e se pokrenuti ukoliko nije konfigurisan tako daje bezbedno instaliran \n"
 "na sistemu kom nije potreban."
 
-#: ../../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 "
@@ -7120,7 +7599,7 @@ msgstr ""
 "protokoli kao NFS i  NIS.Portmap server mora biti pokrenut na ma�inama\n"
 "koje rade kao serveri za protokole koji koriste RPC mehanizam."
 
-#: ../../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."
@@ -7128,7 +7607,7 @@ msgstr ""
 "Postfix je  Mail Transport Agent,koji u stvari \n"
 "preme�ta po�tu sa jedne ma�ine na drugu."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -7136,13 +7615,15 @@ msgstr ""
 "�uva i obnavlja sistemski  entropy pool za ve�i kvalitet generisanje\n"
 "slu�ajnih brojeva."
 
-#: ../../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 ""
+"Dodeljuje raw ureKjaje za blok ureKjaje (kao �to su hard disk\n"
+"particije), �to mogje biti korisno za aplikacije kao �to je 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"
@@ -7152,7 +7633,7 @@ msgstr ""
 "RIP protokola.Dok se RIP dosta korisiti na malim mre�ama,kompleksniji \n"
 " routing protokoli su potrebni za kompleksne mre�e."
 
-#: ../../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."
@@ -7160,7 +7641,7 @@ msgstr ""
 "rstat protokol dozvoljava korisnicima na mre�i da omogu�e\n"
 "merenje performansi za bilo koju ma�inu na toj  mre�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."
@@ -7168,7 +7649,7 @@ msgstr ""
 "rusers protokol omogu�ava korisnicima na mre�i da otkriju ko je\n"
 "ulogovan na drugim ma�inama."
 
-#: ../../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)."
@@ -7176,12 +7657,11 @@ msgstr ""
 "rwho protokol dozvoljava udaljenim korisnicima da dobiju listu svih\n"
 "korisnika ulogovanih na sistem sa pokrenutim rwho demonom (sli�no finger-u)."
 
-#: ../../services.pm_.c:85
-#, fuzzy
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
-msgstr "Pokreni X-Window sistem pri stratanju"
+msgstr "Pokregje sistem za zvuk na va�oj ma�ini"
 
-#: ../../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."
@@ -7189,32 +7669,69 @@ msgstr ""
 "Syslog je objekat pomo�u kog mnogi demoni koriste za logovanje poruka\n"
 "u raznim sistemskim log fajlovima.Dobra je ideja imati uvek pokrenut syslog."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
-msgstr ""
+msgstr "Podi�e drajvere za va�e usb ureKjaje."
 
-#: ../../services.pm_.c:89
-#, fuzzy
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Pokre�e i zaustavlja X Font server pri startanju i ga�enju."
+msgstr "Pokre�e X Font server (potrebno za pokretanje 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 "Izaberite koje servisi  treba automatski da se startuju pri boot-anju"
 
+#: ../../services.pm_.c:126
+#, fuzzy
+msgid "Printing"
+msgstr "�tampa�"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr ""
+
+#: ../../services.pm_.c:132
+#, fuzzy
+msgid "System"
+msgstr "Sistemski mod"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "Opcije za udaljeni lpd"
+
+#: ../../services.pm_.c:145
+#, fuzzy
+msgid "Database Server"
+msgstr "Server,Baze podataka"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr ""
+
+#: ../../services.pm_.c:186
+#, fuzzy
+msgid "Services"
+msgstr "ure�aj"
+
+#: ../../services.pm_.c:198
 msgid "running"
 msgstr "pokrenuto"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "zaustavljeno"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Servisi i demoni"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -7222,11 +7739,16 @@ msgstr ""
 "�alim ali nema dodatnih informacija\n"
 "o ovom servisu."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "Pri startanju"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+#, fuzzy
+msgid "Installing packages..."
+msgstr "Instaliram paket %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"
@@ -7234,15 +7756,66 @@ msgstr ""
 "Ne mogu pro�itati tabelu particija, mnogo je iskvarena za mene :(\n"
 "Poku�a�u dalje zaobilaze�i lo�e particije"
 
-#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
+#: ../../standalone/drakautoinst_.c:44
+#, fuzzy
+msgid "Error!"
+msgstr "Gre�ka"
+
+#: ../../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 "Postinstalaciona konfiguracija"
+
+#: ../../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 "Konfiguracija stila startanja"
+
+#: ../../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 "�estitam !"
+
+#: ../../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 "Deljenje internet konekcije"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Deljenje internet konekcije je trenutno omogu�eno "
 
-#: ../../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"
@@ -7254,31 +7827,31 @@ msgstr ""
 "\n"
 "�ta �elite da uradite?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "onemogu�i"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "ukloni"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
 msgstr "ponovo podesi"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Uklanjam servise..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Deljenje internet konekcije je onemogu�eno."
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Deljenje internet konekcije je trenutno onemogu�eno"
 
-#: ../../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"
@@ -7290,27 +7863,19 @@ msgstr ""
 "\n"
 "�ta �elite da uradite?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "omogu�i"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr ">Omogu�avam servisi..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Deljenje internet konekcije je omogu�eno."
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Konfiguracioni fajl nije mogu�e interpretirati"
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Nepoznata konfiguraciona datoteka"
-
-#: ../../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 "
@@ -7328,21 +7893,21 @@ msgstr ""
 "\n"
 "Da li �elite da podesite deljenje Internet konekcije ?"
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interfejs %s (koriste�i modul %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
 msgstr "Interfejs %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
 msgstr "Nema mre�nog adaptera u va�em sistemu !"
 
-#: ../../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."
@@ -7351,6 +7916,10 @@ msgstr ""
 "hardvera."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Mre�ni interfejs"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7365,28 +7934,29 @@ msgstr ""
 "\n"
 "Sada podeavam va�u lokalnu mre�u sa ovim adapterom."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Izaberite koji �e mre�ni adapter biti kori�ten za LANmre�u."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Upozorenje, mre�ni adapter je ve� konfigurisan. Ja �u ga sada "
 "rekonfigurisati."
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "Potencijalni konflikt LAN adrese u trenutnom konfig. $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "Potencijalni konflikt LAN adrese u trenutnom konfig. %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Detektovana Firewalling konfiguracija"
 
-#: ../../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."
@@ -7394,23 +7964,20 @@ msgstr ""
 "Upozorenje ! Postoje�a firewalling konfiguracija je detektovana. Mo�da�e "
 "biti potrebno ru�no pode�avanje nakon instalacije."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Konfiguracija u toku..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Konfigurisanje skripti,instalacija softvera, startanje servisa..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Problemi pri instalaciji $_ paketa"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "�estitam !"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Problemi pri instalaciji %s paketa"
 
-#: ../../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 "
@@ -7420,27 +7987,27 @@ msgstr ""
 "Sada mo�ete deliti Internet konekciju sa drugim kompjuterima na va�oj "
 "lokalnoj mre�i  (LAN), koriste�i automatsku mre�nu konfiguraciju (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
 "Pode�avanje deljenja internet konekcije je ve� zavr�eno ali je trenutno "
 "onemogu�eno."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
 "Pode�avanje deljenja internet konekcije je ve� zavr�eno i trenutno je "
 "omogu�eno."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Do sada Deljenje internet konekcije nije pode�avano."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Konfiguracija Deljenja Internet konekcije"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7454,84 +8021,82 @@ msgstr ""
 "\n"
 "Kliknite na Podesi (Configure) da bi pokrenuli pode�avanje."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Pode�avanje mre�e (%d adaptera)"
 
-#: ../../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 "Ukloni profil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "Profil za brisanje:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Novi profil..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Ime profila koji se kreira:"
+#: ../../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 "Ime hosta:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "Internet pristup"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
 msgstr "Tip:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
 msgstr "Interfejs:"
 
-#: ../../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 "Konektovan"
 
-#: ../../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 "Nije konektovan"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Konektovanje..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Diskonektovan..."
 
-#: ../../standalone/draknet_.c:191
-#, fuzzy
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
-msgstr "Testiranje konekcije..."
+msgstr "Startujem konekciju..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "Zatvaram konekciju..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7543,120 +8108,119 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "kao root."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "Sistem je sada diskonektovan."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "Podesi Internet pristup..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "LAN konfiguracija"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adapter"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Drajver"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interfejs"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "Status:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Podesi lokalni mre�u..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Normalni Mod"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr ""
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Promeni"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
 msgstr "Samo momenat... primena konfiguracije"
 
-#: ../../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 ""
+"Vi nemate ni jedan interfejs koji je pode�en.\n"
+"Morate ih prvo podesite klikom na 'Configure'"
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "LAN konfiguracija"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "Startni(Boot) protokol"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "Pokrenuto pri startanju"
 
-#: ../../standalone/draknet_.c:431
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "DHCP klijent"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Disable"
-msgstr "Onemogu�i"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "Aktiviraj"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Omogu�i"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "Aktiviraj"
 
-#: ../../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 ""
+"Vi nemate ni jednu pode�enu Internet konekciju.\n"
+"Kreirajte je klikom na 'Configure'"
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Konfiguracija Internet konekcija"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Konfiguracija Internet Konekcija"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "Tip konekcije: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parametri"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Provajderov dns 1 (opciono)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Provajderov dns 2 (opciono)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Mre�na kartica"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP klijent"
 
@@ -7727,15 +8291,30 @@ msgstr ""
 "Uklju�ujete nivo 4 opcija, ali je sada sistem potpuno zatvoren.\n"
 "Sigurnosne opcije su maksimalne."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "Pode�avanje sigurnosnog nivoa"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "Opcije za 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 "Pode�avanje sigurnosnog nivoa"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Kontrolni Centar"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "Izaberite alat koje �elite da koristite"
 
@@ -7763,83 +8342,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Ne mogu da startujem live upgrade !!!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "nije prona�en serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Da imitiram rad 3 tastera?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Molim Vas da testirate mi�a"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "Monitoring mre�e"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Statistike"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "Brzina slanja podataka:"
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "Brzina primanja podataka:"
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "Zatvori"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "Konektujem na Internet "
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "Diskonektujem sa Interneta"
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "Diskonekcija sa Interneta neuspela."
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "Diskonekekcija sa Interneta zavr�ena."
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Konekcija zavr�ena."
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"Konekcija neuspela.\n"
-"Proverite svoju konfiguraciju u Mandrake Kontrolonom Centru."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "poslato:"
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "primljeno: "
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Konektuj"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Diskonektuj"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Firewalling konfiguracija"
@@ -7870,21 +8380,89 @@ msgstr ""
 "\n"
 "Kliknite na Podesi(Configure) da bi podesili standardni firewall"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Izaberite jezik"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Izaberite inst.klasu"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Detekcija hard diska"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Pode�avanje mi�a"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Izaberi tastaturu"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Sigurnost"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Podesi datote�ne sisteme"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formatiraj particije"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Paketi za instalaciju"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Instaliraj sistem"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Dodaj korisnika"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Podesi mre�u"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Podesi servise"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Napravi startni disk"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Instaliraj starter"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Konfigurisanje X-a"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Izlaz iz instalacije"
+
+#: ../../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 ""
 "Mali firewall konfigurator\n"
 "\n"
-"On konfiguri�e li�ni firewall za ovu Linux Mandrake ma�inu.\n"
+"On konfiguri�e li�ni firewall za ovu Mandrake Linux ma�inu.\n"
 "Za mo�no firewall re�enje, pogledajte\n"
 "specijalizovanu MandrakeSecurity Firewall distribuciju."
 
-#: ../../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"
@@ -7902,7 +8480,7 @@ msgstr ""
 "sa njih.  Mo�ete promeniti ove opcije bilo kada ponovnim pokretanjem\n"
 "ove aplikacije!"
 
-#: ../../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"
@@ -7914,7 +8492,7 @@ msgstr ""
 "samo sa ove ma�ine, ovde mo�ete da bezbedno odgovorite NE.\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"
@@ -7927,7 +8505,7 @@ msgstr ""
 "vas da odgovorite ne.\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"
@@ -7941,7 +8519,7 @@ msgstr ""
 "enkriptovan -- tako da neki napada�i mogu ukrasti lozinku ukoliko je\n"
 "koristite. ssh je enkriptovan i ne dozovoljava ovakve stvari."
 
-#: ../../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"
@@ -7953,7 +8531,7 @@ msgstr ""
 "vam preporu�ujemo da ovde odgovorite NE i da koristite ssh umesto\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"
@@ -7965,7 +8543,7 @@ msgstr ""
 "Anonymous transfere. Bilo koja lozinka poslata preko FTP mo�e biti\n"
 "meta napada�a, po�to  FTP tako�e koristi nekritovane lozinke.\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"
@@ -7978,7 +8556,7 @@ msgstr ""
 "ovo.\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"
@@ -7990,7 +8568,7 @@ msgstr ""
 "ove ma�ine.\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"
@@ -8002,7 +8580,7 @@ msgstr ""
 "(dodeljeno dinami�ki), treba da ga omogu�imo za ovo.  Da\n"
 "li je ovo u pitanju?\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"
@@ -8017,7 +8595,7 @@ msgstr ""
 "velike firme ili niste �uli za ovo, onda zaobi�ite \n"
 "ovo."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
@@ -8029,289 +8607,1634 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Ne mogu da otvorim  %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Ne mogu da otvorim %s radi upisa: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klijenti za razli�ite protokole uklju�uju�i i ssh"
+msgid "Web/FTP"
+msgstr "Server, Web/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Razvojna"
+msgid "Network Computer (client)"
+msgstr "Mre�ni kompjuter, (klijent)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Radna stanica"
+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 "Server, Firewall/Router"
+msgid "Office"
+msgstr "Office"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Upravljanje privatnim informacijama"
+msgid "Gnome Workstation"
+msgstr "Gnome radna stanica"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedija - Grafika"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Alati za Palm Pilot ili Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Workstation"
+msgstr "Radna stanica"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Mre�ni kompjuter, (klijent)"
+msgid "Firewall/Router"
+msgstr "Server, 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 ""
+"Office programi: tekst procesori (kword, abiword), tabele (kspread, "
+"gnumeric), pdf preglednici, itd"
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
 msgstr "Audio alati: mp3 ili midi plejeri,mikseri, itd"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet stanica"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knjige i Kako? (Howto's) za Linux i Besplatni Softver"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "KDE Workstation"
+msgstr "KDE padna stanica"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedijalna stanica"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Skup alata za �itanje i slanje el.po�te i vesti (pine, mutt, tin..) i za "
-"pretra�ivanje Interneta"
+msgid "Multimedia - Video"
+msgstr "Multimedija - Video"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C i C++ razvojne biblioteke, programi  i propratne datoteke"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
+msgid "Database"
+msgstr "Server,Baze podataka"
+
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programi za upravljanje va�im finansijama, kao �to je gnucash"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Alati za lako konfigurisanje kompjutera"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgid "Multimedia - Sound"
+msgstr "Multimedija - Zvuk"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, ssh server"
+msgid "Utilities"
+msgstr "Alati"
 
 #: ../../share/compssUsers:999
 msgid "Documentation"
 msgstr "Dokumentacija"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
+msgid "Console Tools"
+msgstr "Konzolni alati"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Alati"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+msgid "Internet station"
+msgstr "Internet stanica"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafi�ko Okru�enje"
+msgid "Multimedia station"
+msgstr "Multimedijalna stanica"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedija - Zvuk"
+#, fuzzy
+msgid "Configuration"
+msgstr "LAN konfiguracija"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Zabavni programi: arkade, ige na tabli, strategije, itd"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Jo� grafi�kih okru�enja (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video plejeri i editori"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop okru�enje, osnovno grafi�ko okru�enje sa kolekcijom prate�ih alata"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konzolni alati"
+msgid "Graphical Environment"
+msgstr "Grafi�ko Okru�enje"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programi za pu�tanje zvuka i videa"
+msgid "Development"
+msgstr "Razvojna"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Nau�na radna stanica"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "editori,�elovi, alati za datoteke, terminali"
+msgid "Tools to create and burn CD's"
+msgstr "Alati za kreiranje i pr�enje CDa"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knjige i Kako? (Howto's) za Linux i Besplatni Softver"
+msgid "Office Workstation"
+msgstr "Radna(Office) stanica"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Grafi�ka okru�enja za setom korisni�kNFS server, SMB server, Proxy serverNFS "
-"server, SMB server, Proxy serverih aplikacija i desktopalata"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itd"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafi�ki programi kao �to je Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Igre"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedija - Video"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C i C++ razvojne biblioteke, programi  i propratne datoteke"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
 msgstr "Mre�ni Server"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafi�ki programi kao �to je Gimp"
+msgid "Mail/Groupware/News"
+msgstr "Server, El.po�ta/Groupware/Vesti"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Radna(Office) stanica"
+msgid "Game station"
+msgstr "Stanica za igru"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"K Desktop okru�enje, osnovno grafi�ko okru�enje sa kolekcijom prate�ih alata"
+msgid "Video players and editors"
+msgstr "Video plejeri i editori"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Jo� grafi�kih okru�enja (Gnome, IceWM)"
+msgid "Multimedia - Graphics"
+msgstr "Multimedija - Grafika"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Alati za kreiranje i pr�enje CDa"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Zabavni programi: arkade, ige na tabli, strategije, itd"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedija - CD pr�enje"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Skup alata za �itanje i slanje el.po�te i vesti (pine, mutt, tin..) i za "
+"pretra�ivanje Interneta"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
 msgstr "Arhiviranje, emulatori, monitoring"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Server,Baze podataka"
+msgid "Personal Finance"
+msgstr "Li�ne finansije"
 
 #: ../../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 ""
-"Office programi: tekst procesori (kword, abiword), tabele (kspread, "
-"gnumeric), pdf preglednici, itd"
+"Grafi�ka okru�enja za setom korisni�kNFS server, SMB server, Proxy serverNFS "
+"server, SMB server, Proxy serverih aplikacija i desktopalata"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Server, Web/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr "Klijenti za razli�ite protokole uklju�uju�i i ssh"
 
 #: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Server"
+#, fuzzy
+msgid "Internet gateway"
+msgstr "Internet pristup"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Li�ne finansije"
+msgid "Sound and video playing/editing programs"
+msgstr "Programi za pu�tanje zvuka i videa"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfiguracija"
+msgid "Other Graphical Desktops"
+msgstr "Drugi grafi�ki desktopovi"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE padna stanica"
+msgid "Editors, shells, file tools, terminals"
+msgstr "editori,�elovi, alati za datoteke, terminali"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Drugi grafi�ki desktopovi"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programi za upravljanje va�im finansijama, kao �to je gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
+msgid "Games"
+msgstr "Igre"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Server, El.po�ta/Groupware/Vesti"
+msgid "Personal Information Management"
+msgstr "Upravljanje privatnim informacijama"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome radna stanica"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedija - CD pr�enje"
 
 #: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+msgstr "Nau�na radna stanica"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "ne mogu otvoriti /etc/sysconfig/autologin za �itanje: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "Da li ho�ete da restartujete mre�e?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "Da li se sla�ete?"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "Sadam treba da se restartuje mre�ni interfejs:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "Sada treba da se restartuje mre�ni ure�aj  %s. Da li se sla�ete ?"
+
 #, fuzzy
-msgid "Internet gateway"
-msgstr "Internet pristup"
+#~ msgid ""
+#~ "Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+#~ "(primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+#~ msgstr ""
+#~ "Ukoliko nije druga�ije odre�eno, oubi�ajen izbor je \"/dev/hda\"\n"
+#~ "(master disk na primarnom kanalu) ili \"/dev/sda\" (first SCSI disk)."
 
-#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Alati za Palm Pilot ili Visor"
+#, fuzzy
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "Ovo su postavljne opcije.\n"
+#~ "Mo�ete dodati nove ili izmeniti stare."
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Stanica za igru"
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "Vreme konekcije: "
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, itd"
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "Izaberite default (osnovnog) korisnika:"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Alati za lako konfigurisanje kompjutera"
+#~ msgid "Spooler: "
+#~ msgstr "Sistem za �tampanje (Spooler): "
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
+#~ msgid "Test the mouse here."
+#~ msgstr "Sada testirajte mi�a"
+
+#~ msgid "Press next to continue."
+#~ msgstr "Pritisnite \"Slede�i\" da bi nastavili "
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ msgstr ""
+#~ "Izaberite vama odgovaraju�i jezik za instaliranje i kori��enje 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 ""
+#~ "Morate da prihvatite uslove licence da bi nastavili instalaciju.\n"
+#~ "\n"
+#~ "\n"
+#~ "Molim vas da pritisnete na \"Prihvatam\" ukoliko se sla�ete sa uslovima.\n"
+#~ "\n"
+#~ "\n"
+#~ "Molim vas da pritisnete na \"Odbijam\" ukoliko se ne sla�ete sa uslovima."
+#~ "Instalacija�e biti zav�ena bez imakvih promena"
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ msgstr "Izaberite tip komunikacije sa tastaturom od gore navedenih"
+
+#~ 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 ""
+#~ "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"
+#~ "\"."
+
+#~ 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 ""
+#~ "Izaberite:\n"
+#~ "\n"
+#~ " - Sa pode�avanjima (Customized): Ukoliko ste upoznati sa Linux-om mo�i "
+#~ "�ete\n"
+#~ "da izaberete normal,development ili server mod instalacije.\n"
+#~ "Izaberite \"Normal\" instalaciju pri uobi�ajenom kori��enju ra�unara\n"
+#~ "Mo�ete izabrati \"Development\" instalaciju ukoliko �ete se prvenstveno\n"
+#~ "razvojem softvera, ili \"Server\" ukoliko �elite da postavite standardnu\n"
+#~ "server ma�inu (za po�tu, �tampanje...)\n"
+#~ "\n"
+#~ "\n"
+#~ " - Ekspert: Ukoliko ste dobro poznajte GNU/Linux i �elite izuzetno\n"
+#~ "podesivu instalaciju onda je ovo pravi mod za vas. Mo�i �ete izabrati\n"
+#~ "kori��enje sistema kao \"Preporu�eno\"."
+
+#~ 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 ""
+#~ "Sada morate definisati za �ta �ete koristiti va�u ma�inu.Va� izbor je:\n"
+#~ "\n"
+#~ "  - Radna stanica : ovo je idealan izbor ukoliko nameravate da koristite "
+#~ "va�e ma�inuuglavnom za svakodnevnu upotrebu  (obrada teksta,tablice, "
+#~ "grafika itd).\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Razvojna stanica: samo joj  ime ka�e. Izaberite ovo ukoliko imate "
+#~ "nameru da va�u ma�inu uglavnom koristite za razvoj softvera. Tada �e te "
+#~ "imati kompletnu\n"
+#~ "kolekciju softvera  za kompajliranje, debagiranje i formatiranje\n"
+#~ "izvornog koda, ili za kreiranje softverskoih paketa.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Server: izaberite ovo ukoliko imate nameru da Mandrake Linux\n"
+#~ "koristite kao server. Ili kao fajl server (NFS ili  SMB),\n"
+#~ "ili server protokol za �tampu(Unix' lp (Line Printer ili  Windows  SMB\n"
+#~ "�tampanje) ili  autenti�ni server (NIS), ili kao server za bazu  podataka "
+#~ "itd.\n"
+#~ "Kao takav, on ne�e imati instaliran luksuz (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 ""
+#~ "Sada mo�ete izabrati grupu paketa koje �elite\n"
+#~ "da instalirate. ili a�urirate.\n"
+#~ "\n"
+#~ "\n"
+#~ "DrakX �e zatim proveriti da li imate mesta za njihovo instaliranje."
+#~ "Ukoliko nema,\n"
+#~ "on �e vas upozoriti na to. Ukoliko �elite da nastavite, nastavi�e se "
+#~ "instalacija\n"
+#~ "svih odabranih grupa ali �e neki paketi od manjeg zna�aja biti "
+#~ "izostavljeni.Na kraju liste\n"
+#~ "mo�ete izabrati opcijy \"Pojedina�na selekcija paketa\";\n"
+#~ "U tom slu�aju mora�ete birati izme�u vi�e od 1000 paketa..."
+
+#~ 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 ""
+#~ "Sada mo�ete ru�no izabrati sve pakete koje\n"
+#~ "�elite da instalirate.\n"
+#~ "\n"
+#~ "\n"
+#~ "Mo�ete da ra�iriti ili skupiti stablo klikaju�i na opcije koje se nalazeu "
+#~ "uglu\n"
+#~ "prozora sa paketima.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko �elite da vidite pakete sortirane po abecednom redu, kliknite na "
+#~ "ikonu\n"
+#~ "\"Postavi ravno i grupno sortirano\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko ne �elite da budete upozoreni na zavisnosti, kliknite na "
+#~ "\"Automatske\n"
+#~ "zavisnosti\". Ukoliko ovo �elite, zapamtite da deselektovanje jednog "
+#~ "paketa mo�e neprime�eno\n"
+#~ "da deselektuje i nekoliko drugih paketa koji zavise od njega."
+
+#~ 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 ""
+#~ "Ukoliko imate sve gore navedene CD-ove, kliknite na Ok.\n"
+#~ "Ukoliko nemate nijedan CD, kliknite na Cancel.\n"
+#~ "Ako vam nedostaju  neki CD-ovi, deselektujete ih,a onda,\n"
+#~ "kliknite na Ok."
+
+#~ 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 ""
+#~ "Sada mo�ete da testirate va�eg mi�a. Koristite tastere i to�kins 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."
+
+#~ 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 ""
+#~ "Ukoliko �elite da konektujte kompjyter na Internet ili\n"
+#~ "na lokalnu mre�u izaberite pravu opciju. molim Vas da uklju�iteure�aj\n"
+#~ "pre biranja prave opcije da bi dozvolili DrakX-u da ga auomatski "
+#~ "detektuje.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko nemate vezu sa Internetom ili lokalnom mre�om, izaberite\n"
+#~ "\"Isklju�i mre�u\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko �elite da kasnije uradite konfiguraciju (nakon instalacije)ili "
+#~ "ste\n"
+#~ "zavr�ili konfigurisanje, izaberite \"Zavr�eno\"."
+
+#~ 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 ""
+#~ "Nijedam modem nije detektovan. Izaberite serijski port na kojem jemodem "
+#~ "priklju�en.\n"
+#~ "\n"
+#~ "\n"
+#~ "Da bi shvatili, prvi serijski portserial port (koji se zove \"COM1\" pod "
+#~ "Microsoft\n"
+#~ "Windows-om) se zove \"ttyS0\" pod Linux-om."
+
+#~ 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 ""
+#~ "Sada mo�ete uneti dialup postavke. Ukoliko ne znate ili \n"
+#~ "ili niste sigurni �ta da unesete, prave informacije mo�ete dobitiod\n"
+#~ "va�eg Internet provajdera. Ukoliko ne unesete DNS (ime servera)\n"
+#~ "informaciju sada,ovu informaciju mo�ete imati kada se konektujetena "
+#~ "servis\n"
+#~ "va�eg Internet provajdera."
+
+#~ msgid ""
+#~ "If your modem is an external modem, please turn on it now to let DrakX "
+#~ "detect it automatically."
+#~ msgstr ""
+#~ "Ukoliko imate eksterni modem uklju�ite ga, da bi DrakX mogao automatski "
+#~ "da ga detektuje."
+
+#~ msgid "Please turn on your modem and choose the correct one."
+#~ msgstr "Uklju�ite va� modem i izaberite pravi"
+
+#~ 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 ""
+#~ "Ukoliko niste sigurni da su gore navedene informacije\n"
+#~ "ispravne ili niste sigurni �ta treba da unesete, prave\n"
+#~ "informacije mo�ete dobaviti od va�eg Internet provajdera. Ukoliko ovdene\n"
+#~ "unsete DNS (ime servera) informacije, ovu informaciju mo�etedobaviti\n"
+#~ "od va�eg Internet provajdera kada se konektujete."
+
+#~ 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 ""
+#~ "Sada mo�ete uneti ime host-a ukoliko je potrebno. Ukoliko niste sigurni "
+#~ "�ta da unesete,\n"
+#~ "ispravne informacije �ete prona�i kod va�eg ISP-a."
+
+#~ 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 ""
+#~ "Sada mo�ete podesiti mre�nu karticu:\n"
+#~ "\n"
+#~ " - IP adresa: ukoliko je ne znate, kontaktirajte mre�nog administratora "
+#~ "ili ISP.\n"
+#~ "\n"
+#~ "\n"
+#~ " - Mre�na maska: \"255.255.255.0\" je ve�inom dobar izbor. Ukoliko niste\n"
+#~ "sigurni, kontaktirajte mre�nog administratora ili ISP.\n"
+#~ "\n"
+#~ "\n"
+#~ " - Automatski IP: ukoliko va�a mre�a koristi bootp ili dhcp protokole,\n"
+#~ "izaberite ovu opciju. Ukoliko je selektovana, nije potrebna vrednost u\n"
+#~ "\"IP adresa\". Ukoliko niste sigurni, kontaktirajte mre�og administratora "
+#~ "ili ISP."
+
+#~ 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 ""
+#~ "Sada mo�ete uneti ime host-a ukoliko je potrebno. Ukoliko niste sigurni "
+#~ "�ta da unesete,\n"
+#~ "sigurni kontaktirajte va�eg administratora."
+
+#~ 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 ""
+#~ "Sada mo�ete uneti ime host-a ukoliko je potrebno.\n"
+#~ "Ukoliko niste sigurni �ta da unesete, ostaite prazno."
+
+#~ 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 ""
+#~ "Sada unosite dialup opcije. Ukoliko niste sigurni �ta da unesete,\n"
+#~ "ispravne informacije �ete prona�i kod va�eg 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 ""
+#~ "Ukoliko koristite proksije, konfiguri�ite ih sada. Ukoliko ne znate\n"
+#~ "da li �ete ih koristiti, konsultujte mre�og administratora ili ISP."
+
+#~ 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 ""
+#~ "Mo�ete instalirati kriptografski paket ukoliko je internet konekcija\n"
+#~ "pravilno pode�ena. Prvo izaberite prostor gde �ete download-ti pakete\n"
+#~ "i nakon toga izabrati pakete koje �ete instalirati.\n"
+#~ "\n"
+#~ "\n"
+#~ "Morate izabrati mirror i kripto paket\n"
+#~ "vode�i ra�una o zakonima."
+
+#~ msgid "You can now select your timezone according to where you live."
+#~ msgstr ""
+#~ "Sada mo�ete podesiti vremensku zonu u zavisnosti od mesta gde �ivite"
+
+#~ 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 ""
+#~ "Mo�ete podesiti lokalni �tampa� (koji je povezan na kompjuter) ili "
+#~ "udaljeni\n"
+#~ "�tampa� (kojem mo�ete pristupiti preko Unix, Netware ili  Microsoft "
+#~ "Windows mre�e)."
+
+#~ 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 ""
+#~ "Ukoliko �elite da imate mogu�nost da �tampate, morate da izaberete sistem "
+#~ "za �tampanje izme�u\n"
+#~ "CUPS ili LPR-a.\n"
+#~ "\n"
+#~ "\n"
+#~ "CUPS je novi, mo�ni i fleksibilni sistem za �tampanje za Unix sisteme "
+#~ "(CUPS\n"
+#~ "je skra�enica za \"Common Unix Printing System\"). On je postavljen za "
+#~ "default sistem za �tampanje u\n"
+#~ "Mandrake Linux-u.\n"
+#~ "\n"
+#~ "\n"
+#~ "LPR je stari sistem za �tampanje koji se koristio u prethodnim Mandrake "
+#~ "Linux distribucijama.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko nemate �tampa�, kliknite na \"Nema\"."
+
+#~ 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 mo�e da radi sa velikim brojem �tampa�a. Svaki od tipova "
+#~ "�tampa�a zahteva\n"
+#~ "druga�ije pode�avanje.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko je va� �tampa� fizi�ki vezan za kompjuter, izaberite opciju  "
+#~ "\"Lokalni\n"
+#~ "�tampa�\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko �elite da pristupite �tampa�u koji se nalazi na udaljenoj Unix "
+#~ "ma�ini, izaberite\n"
+#~ "\"Udaljeni �tampa�\".\n"
+#~ "\n"
+#~ "\n"
+#~ "Ukoliko �elite da pristupite �tampa�u koji se nalazi na udaljenoj "
+#~ "Microsoft Windows ma�ini\n"
+#~ "(ili na Unix ma�ini koriste�i SMB protokol), izaberite \"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 ""
+#~ "Molim vas da upalite �tampa� pre nego �to nastavite da bi DrakX mogao da "
+#~ "ga detektuje.\n"
+#~ "\n"
+#~ "Ovde �ete morati da uneste neke podatke.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Ime �tampa�a: �tampa�ev spooler koristi \"lp\" kao default ime za "
+#~ "�tampa�. Dakle, morate imati �tampa� koji se zove \"lp\".\n"
+#~ "     Ukoliko imate samo jedan �tampa�, mo�ete koristiti vi�e imena za "
+#~ "njega. Treba samo da  ih odvojite pipe\n"
+#~ "     karakterom (tj. \"|\"). Dakle, ukoliko volite ime koje ne�to i "
+#~ "zna�i, morate da ga postavite na prvo mesto, na primer: \"Moj �tampa�|lp"
+#~ "\".\n"
+#~ "     �tampa� koji ima\"lp\" u svom imenu(nima) �e biti default �tampa�.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Opis: ovo nije obavezna funkcija ali mo�e biti korisna ukoliko je "
+#~ "vi�e �tampa�apovezano na va� kompjuter ili ukoliko �elite da dozvolite "
+#~ "pristup\n"
+#~ "     drugim kompjuterima na ovaj �tampa�.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Lokacija: ukoliko �elite date neke informacije o lokaciji va�eg\n"
+#~ "     �tampa�a, onda to mo�ete ovde uraditi (ovde mo�ete upisati bilo "
+#~ "�ta,\n"
+#~ "     na primer \"drugi sprat\").\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 ""
+#~ "Ovde morate da unesete neke informacije.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Ime �tampa�a: �tampa�ev spooler koristi \"lp\" kao default ime "
+#~ "�tampa�a. Pa tako morate da imate �tampa� sa imenom \"lp\".\n"
+#~ "    Ukoliko iamte samo jedan �tampa�, mo�ete da mu date vi�e imena. Samo "
+#~ "ihodovojite pipe\n"
+#~ "    karakterom (tj. \"|\"). Dakle, ukoliko vi�e volite imane sa "
+#~ "zna�enjem, onda ga morae staviti na prvo mesto, na primer: \"Moj �tampa�|"
+#~ "lp\".\n"
+#~ "    �tampa� koji ima\"lp\" u svom imenu je ujedno i default �tampa�.\n"
+#~ "\n"
+#~ "  \n"
+#~ "   * Spool direktorijum: to je direktorijum u kojem se nalaze zadati "
+#~ "poslovi za �tampanje. Zadr�ite default izbor\n"
+#~ "     ukoliko ne znate �ta da koristite\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Konektovanje �tampa�a: Ukoliko je �tampa� fizi�ki vezan za "
+#~ "kompjuter, izaberite \"Lokalni �tampa�\".\n"
+#~ "     Ukoliko �elite da pristupite �tampa�u koje lociran na udaljenoj Unix "
+#~ "ma�ini, izaberite \"Udaljeni lpd �tampa�\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Ukoliko �elite da pristupite �tampa�u koje lociran na udaljenoj "
+#~ "Microsoft Windows  ma�ini (ili na Unix ma�ini koriste�i SMB\n"
+#~ "     protokol), izaberite \"SMB/Windows 95/98/NT\".\n"
+#~ "\n"
+#~ "\n"
+#~ "     Ukoliko �elite da pristupite �tampa�u koje lociran na NetWare mre�i, "
+#~ "izaberite\"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 ""
+#~ "Va� �tampa� nije detektovan. Unesite ime ure�aja/porta na\n"
+#~ "koji je priklju�en.\n"
+#~ "\n"
+#~ "\n"
+#~ "Za va�u informaciju, ve�ina �tampa�a je povezana na prvi paralelni port. "
+#~ "A taj port\n"
+#~ "se naziva \"/dev/lp0\" pod GNU/Linux-om i  \"LPT1\" pod  Microsoft "
+#~ "Windows-om."
+
+#~ msgid "You must now select your printer in the above list."
+#~ msgstr "Sada morate izabrati va� �tampa� sa gornje liste"
+
+#~ 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 ""
+#~ "Molim vas izaberite prave opcije koje su u skladu sa va�im �tampa�em.\n"
+#~ "Pogledajte i dokumentaciju koju  ste dobili uz �tampa� ukoliko ne znate "
+#~ "�ta to ovde birate.\n"
+#~ "\n"
+#~ "\n"
+#~ "Mo�i �ete da testirate svoju konfiguraciju u slede�em koraku i mo�i �ete "
+#~ "da menjatemo�i �ete da je menjate ukoliko neradti kako vi �elite."
+
+#~ 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 ""
+#~ "Sada, mo�ete uneti  root lozinku za va� Mandrake Linux sistem.\n"
+#~ "Lozinka mora biti uneta dva puta radi verifikacije da su oba unosa\n"
+#~ "lozinki ista.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root je administrator sistema, i jedni korisnikkoji\n"
+#~ "mo�e da modifikuje sistemske opcije. Zbog toga,\n"
+#~ "birajte lozinku pa�ljivo! Nedozvoljeni pristup na root ra�un mo�ebiti "
+#~ "veoma opasan\n"
+#~ "za bezbednost sistema i podataka, kao i drugih povezanih sistema.\n"
+#~ "\n"
+#~ "\n"
+#~ "Lozinka treba da me�avina alfanumeri�kih\n"
+#~ "karaktera i najmanje 8 karaktera duga�ka.\n"
+#~ "\n"
+#~ "\n"
+#~ "*Nikada* je ne zapisujte na papir. Ne pravite lozinku previ�edugom\n"
+#~ "i komplikovanom, jer je morate upamtiti bez mnogo napora."
+
+#~ 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 ""
+#~ "Ukoliko va�a mre�a koristi LDAP (ili NIS) protokol za identifikaciju, "
+#~ "izaberite\n"
+#~ "\"LDAP\" (ili \"NIS\") kao identifikaciju. Ukoliko ne znate, pitajte "
+#~ "va�eg mre�nog\n"
+#~ "administratora.\n"
+#~ "\n"
+#~ "Ukoliko va� kompjuter nije pozvezan ni na jednu administriranu mre�u, "
+#~ "mo�da �elite da\n"
+#~ "izaberete \"Lokalne datoteke\" za identifikaciju."
+
+#~ 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 ""
+#~ "Sada mo�ete kreirati jedan ili vi�e obi�nih \"regular\" korisni�kih\n"
+#~ "ra�una, nasuprot privilegovanom \"privileged\" korisni�kom ra�unu, root.\n"
+#~ "Mo�ete kreirati jedan ili vi�e ra�una za svaku osobu koja �eli koristiti\n"
+#~ "ra�unar. Nema limita. Svaki korisnik �e imati sopstveno pode�ene "
+#~ "parametre\n"
+#~ "(grafi�ko okru�enje, kao i svoj home direktorijum \"Osnovna direktorijum"
+#~ "\",\n"
+#~ "u kojem se ovi parametri i nalaze.\n"
+#~ "\n"
+#~ "\n"
+#~ "Pre svega, napravite ra�un za va� same! �ak i ukoliko �ete biti jedini\n"
+#~ "korisnik na ra�unaru, NE treba da se konektujete kao root za svakodnevnu\n"
+#~ "upotrebu sistema: to je veoma veliki sigurnosni rizik. Mo�ete sistem\n"
+#~ "u�initi nestabilnim ili ga �ak onesposobiti �to je �esta pojava !\n"
+#~ "Zbog toga, TREBA da se konektujete koriste�i obi�an korisnik . Ra�un "
+#~ "koji\n"
+#~ "�ete kreirati ovde, a root ra�un koristiti SAMO pri administriranju ili\n"
+#~ "odr�avanju sistema."
+
+#~ 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 ""
+#~ "Kreiranje startne(boot) diskete je vrlo preporu�ljivo. Ukoliko ne mo�ete "
+#~ "da\n"
+#~ "startujete kompjuter, to je jedini na�in da spasite sistem od\n"
+#~ "reinstalacije."
+
+#~ 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 ""
+#~ "Glavne opcije za LILO i grub su:\n"
+#~ "  - Boot ure�aj: Pode�ava ime ure�aja (npr. hard disk particije)\n"
+#~ "koji sadr�i boot sektor. Ukoliko druga�ije nije odre�eno,\n"
+#~ "izaberite \"/dev/hda\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Pauza pre startanja default image-a: Specificira broj u desetim "
+#~ "delovima\n"
+#~ "sekunde za koji starter treba da �eka pre startanja prvog image-a.\n"
+#~ "Ovo je korisno na sistemima koji odmah startaju sa hard diska posle\n"
+#~ "detekcije tastaure. Starter ne �eka ukoliko je  \"delay\" \n"
+#~ "prazno ili pode�eno na 0 - nula .\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Video mod: Ovaj mod pode�ava VGA tekst mod koji se bira pri\n"
+#~ "startanju. Mogu�e su slede�e vrednosti: \n"
+#~ "\n"
+#~ "    * normalno: koristi normalni 80x25 tekst mod.\n"
+#~ "\n"
+#~ "    * <broj>: koristi korespondentni tekst mod.\n"
+#~ "\n"
+#~ "  - O�isti \"/tmp\" pri svakom startanju : ukoliko �elite da uklonite sve "
+#~ "datoteke i direktorijume\n"
+#~ "koji sse nalaze u \"/tmp\" kada startuje sistem, selektujte ovu opciju.\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Defini�ite RAM ukoliko je potrebno: na �alost, ne postoji standardni "
+#~ "metod  upit\n"
+#~ "BIOS-u o veli�ini RAM prisutnog u va�em kompjuteru. Kao posledica toga, "
+#~ "Linux mo�e\n"
+#~ "fpogre�no detektovati veli�inu RAM memorije. Ukoliko se to desi, mo�ete\n"
+#~ "ovde sami uneti pravu veli�inu RAMa. Zapamtite da razlika u  2 ili 4\n"
+#~ "MB izme�u detektovane i stvarne veli�ine RAMa u sistemu �este normalna "
+#~ "stvar."
 
-#~ msgid "GB"
-#~ msgstr "GB"
+#~ 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 je starter za SPARC: on mo�e da starta\n"
+#~ "ili Linux ili bilo koji  drugi  operativni sistem prisutan na va�em "
+#~ "kompjuteru.\n"
+#~ "Naravno, ovi drugi operat.sistemi su ispravno detektovani i "
+#~ "instalirani. \n"
+#~ "Ukoliko to nije tako,mo�ete to sami urediti ovde.Pazite kada unosite "
+#~ "parametre\n"
+#~ "\n"
+#~ "\n"
+#~ "Tako�e,mo�ete �eleti da ostalim operat.sistemima onemogu�ite da pristupe "
+#~ "drugi \n"
+#~ "U tom slu�aju, treba da izbri�ete odgovaraju�e linije za te sisteme. Ali\n"
+#~ "onda morate imati boot diskete da bi ih startali !"
 
-#~ msgid "KB"
-#~ msgstr "KB"
+#~ 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 glavne opcije su:\n"
+#~ "  - Instalacija startera: nazna�ite gde �elite da smestite informacije\n"
+#~ "potrebne za startanje Linux-a.Ukoliko ne znate ta�no �ta radite,\n"
+#~ "izaberite \"Prvi sektor hard diska (MBR)\".\n"
+#~ "\n"
+#~ "\n"
+#~ "  - Pauza pre startanja default image-a: Specificira broj u desetim "
+#~ "delovima\n"
+#~ "sekunde za koji starter treba da �eka pre startanja prvog image-a.\n"
+#~ "Ovo je korisno na sistemima koji odmah startaju sa hard diska posle\n"
+#~ "detekcije tastaure. Starter ne �eka ukoliko je  \"delay\" \n"
+#~ "prazno ili pode�eno na 0 - nula ."
 
-#~ msgid "TB"
-#~ msgstr "TB"
+#~ 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 ""
+#~ "Sada je do�lo vreme da podesimo X Window sistem, koji je\n"
+#~ "jezgro Linux GUI-a (Linux Grafi�ko Korisni�ko Okru�enje). U tu svrhu,\n"
+#~ "morate konfigurisati va�u video kartu i monitor. Ve�inom\n"
+#~ "su ovi postupci automatizovani, tako da se va� posao mo�e\n"
+#~ "svesti na potvr�ivanje onog �to je ura�eno i prihvatanje\n"
+#~ "pode�enih opcija :-)\n"
+#~ "\n"
+#~ "\n"
+#~ "Kada konfiguracija bude zavr�ena, X-ovi �e se podi�i (osim ako\n"
+#~ "ka�ete DrakX-u da to ne radi!) tako da mo�ete isprobati da li je\n"
+#~ "sve pode�eno kako valja. Ako se ne podignu, vratite se korak nazad\n"
+#~ "i promenite pode�avanje koliko god puta je potrebno."
 
-#~ msgid "%d minutes"
-#~ msgstr "%d minuta"
+#~ msgid ""
+#~ "If something is wrong in X configuration, use these options to correctly\n"
+#~ "configure the X Window System."
+#~ msgstr ""
+#~ "Ukoliko je ne�to pogre�no u X konfiguraciji, koristite ove opcije\n"
+#~ "da bi ispravno podeesili X Window sistem."
 
-#~ msgid "1 minute"
-#~ msgstr "1 minut"
+#~ msgid ""
+#~ "If you prefer to use a graphical login, select \"Yes\". Otherwise, "
+#~ "select\n"
+#~ "\"No\"."
+#~ msgstr ""
+#~ "Ukoliko vi�e volite logovanje u grafi�kom modu, izaberite \"Da\".\n"
+#~ "U suprotnom izaberite \"Ne\"."
+
+#~ 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 ""
+#~ "Mo�ete izabrati sigurnosni nivo za va� sistem. Pogledajte upustvo za "
+#~ "vi�e\n"
+#~ "  informacija. U osnovi, ukoliko ne znate �ta da odaberetee, ostavite "
+#~ "default opciju.\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 ""
+#~ "Sistem �e se resetovati.\n"
+#~ "\n"
+#~ "Posle resetovanja, va� novi Mandrake Linux sistem �e se podi�i "
+#~ "automatski.\n"
+#~ "Ukoliko �elite da podignete neki drugi instalirani operativni sistem,\n"
+#~ "pro�itate upustvo ili posetite neki od Linux chat kanala."
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "�e�ki (Programeri)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slova�ki (Programerski)"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sekundi"
+#~ msgid "Name of the profile to create:"
+#~ msgstr "Ime profila koji se kreira:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Ispi�i /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Povrati (restore) iz datoteke"
+
+#~ msgid "Save in file"
+#~ msgstr "Snimi u datoteku"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Povrati (restore) sa diskete"
+
+#~ msgid "Format all"
+#~ msgstr "Formatiraj sve"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Posle formatiranja svih particija,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "svi podaci na njima �e biti uni�teni"
+
+#~ msgid "Reload"
+#~ msgstr "Ponovo unesi"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "Da li �elite da kreirate autoinstalacioni flopi za replikaciju linux-a ?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL konfiguracija"
+
+#~ 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 ""
+#~ "Sa udaljenim CUPS serverom, ne morate da kofiguri�ete\n"
+#~ "ovde ni jedan �tampa�; �tampa�i �e biti automatski detektovani.\n"
+#~ "osim ako imate server na drugoj mre�i; ako je to\n"
+#~ "slu�aj, morate dati IP adresu  CUPS servera\n"
+#~ "a opciono i broj porta."
+
+#~ msgid "Enter Printer Name and Comments"
+#~ msgstr "Unesite Ime �tampa�a i Komentare"
+
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Nedostaje ime za udaljeni red!"
+
+#~ msgid "Pipe into command"
+#~ msgstr "Ubaci u komandu"
+
+#~ msgid ""
+#~ "Here you can specify any arbitrary command line into which the job should "
+#~ "be piped instead of being sent directly to a printer."
+#~ msgstr ""
+#~ "Ovde mo�ete odrediti bilo koju komandnu liniju na koju bi �tampa� poslao "
+#~ "zadatak umesto da ga po�alje direktno na �tampu."
+
+#~ msgid "Command line"
+#~ msgstr "Komandna linija"
+
+#~ msgid "A command line must be entered!"
+#~ msgstr "Komandna linija mora biti une�ena!"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Monitoring mre�e"
+
+#~ msgid "Settings"
+#~ msgstr "Opcije"
+
+#~ msgid "Profile "
+#~ msgstr "Profil "
+
+#~ msgid "Statistics"
+#~ msgstr "Statistike"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "Brzina slanja podataka:"
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "Brzina primanja podataka:"
+
+#~ msgid "Connection Time: "
+#~ msgstr "Vreme konekcije: "
+
+#~ msgid "Logs"
+#~ msgstr "Logovi"
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Konektujem na Internet "
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Diskonektujem sa Interneta"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Diskonekcija sa Interneta neuspela."
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Diskonekekcija sa Interneta zavr�ena."
+
+#~ msgid "Connection complete."
+#~ msgstr "Konekcija zavr�ena."
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "Konekcija neuspela.\n"
+#~ "Proverite svoju konfiguraciju u Mandrake Kontrolonom Centru."
+
+#~ msgid "Color configuration"
+#~ msgstr "Konfiguracija boje"
+
+#~ msgid "sent: "
+#~ msgstr "poslato:"
+
+#~ msgid "received: "
+#~ msgstr "primljeno: "
+
+#~ msgid "average"
+#~ msgstr "prose�no"
+
+#~ msgid "Connect"
+#~ msgstr "Konektuj"
+
+#~ msgid "Disconnect"
+#~ msgstr "Diskonektuj"
+
+#~ msgid "/File/_New"
+#~ msgstr "/_Datoteka/_Nova"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Datoteka/_Otvori"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Datoteka/_Sa�uvaj"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Datoteka/Sa�uvaj_Kao"
+
+#~ msgid "/File/-"
+#~ msgstr "/Datoteka/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Opcije"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Opcije/Test"
+
+#~ msgid "/_Help"
+#~ msgstr "_Pomo�"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Pomo�/_O..."
+
+#~ msgid "Default Runlevel"
+#~ msgstr "Podrazumevani Runlevel"
+
+#~ msgid "Europe"
+#~ msgstr "Evropa"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#~ msgid "Remove queue"
+#~ msgstr "Ukloni queue"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Konfiguracioni fajl nije mogu�e interpretirati"
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Nepoznata konfiguraciona datoteka"
+
+#~ msgid "Adapter"
+#~ msgstr "Adapter"
+
+#~ msgid "Disable network"
+#~ msgstr "isklju�i  mre�u"
+
+#~ msgid "Enable network"
+#~ msgstr "Uklju�i mre�u"
+
+#~ 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 ""
+#~ "Sada mo�ete da testirate mi�a. Pritiskajte tastere i pokrenite to�ki� da "
+#~ "bi potvrdili\n"
+#~ "da li su postavke dobre. Ukoliko nisu, kliknite na \"Poni�ti\" da bi "
+#~ "izabrali drugi\n"
+#~ "drajver."
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "DSL (ili ADSL) konekcija"
+
+#, fuzzy
+#~ msgid "Choose"
+#~ msgstr "Zatvori"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "Mo�ete da odredite URI direktno radi pristupa �tampa�u sa CUPS-a"
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "Da, i�tampaj ASCII test stranicu"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "Da, i�tampaj PostScript test stranicu"
+
+#~ msgid "Yes, print both test pages"
+#~ msgstr "Da, i�tampaj obe test stranice"
+
+#~ msgid "Paper Size"
+#~ msgstr "Veli�ina papira"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "Izbaci papir nakon �tampanja ?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "Uniprint  drajver -opcije"
+
+#~ msgid "Color depth options"
+#~ msgstr "Opcija - Broj boja"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "�tampaj tekst kao PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Popraviti  'efekat stepenica' u tekstu?"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "Broj stranica po izlaznim stranicama"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "Desna/leva margina u ta�kama (1/72 deo in�a)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "Vrh/dno margina u ta�kama (1/72 deo in�a)"
+
+#~ msgid "Extra GhostScript options"
+#~ msgstr "Dodatne GhostScript opcije"
+
+#~ msgid "Extra Text options"
+#~ msgstr "Dodatne Tekst opcije"
+
+#~ msgid "Reverse page order"
+#~ msgstr "Obrnut redosled stranica"
+
+#~ msgid "CUPS starting"
+#~ msgstr "Pokre�em CUPS.."
+
+#~ msgid "Select Remote Printer Connection"
+#~ msgstr "Izaberi  konekciju udaljenih �tampa�a"
+
+#~ 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 ""
+#~ "Sa udaljenim CUPS serverom, ne morate da kofiguri�ete\n"
+#~ "ovde ni jedan �tampa�; �tampa�i �e biti automatski detektovani.\n"
+#~ "In Ukoliko se dvoumite, izaberite \"Udaljeni CUPS server\"."
+
+#~ 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 ""
+#~ "Svaki  �tampa� mora da ima ime (npr. lp).\n"
+#~ "Ostali parametri kao �to je opis ili njegova lokacija \n"
+#~ "mogu biti definisani.Koje ime treba da bude iskori�teno za  ovaj �tampa� "
+#~ "i\n"
+#~ "kako je �tampa� povezan?"
+
+#~ 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 ""
+#~ "Svaki 'red' za �tampu (u koji se sla�u poslovi za �tampanje) zahteva\n"
+#~ "ime (obi�no lp) i 'spool' direktorijum koji uz to ide. Koje ime i "
+#~ "direktorijum\n"
+#~ "da koristim za ovaj red za �tampu i kako je  �tampa� povezan?"
+
+#~ msgid "Name of queue"
+#~ msgstr "Ime queue-a "
+
+#~ msgid "Spool directory"
+#~ msgstr "'Spool direktorijum"
+
+#~ msgid "Disable"
+#~ msgstr "Onemogu�i"
+
+#~ msgid "Enable"
+#~ msgstr "Omogu�i"
+
+#, fuzzy
+#~ msgid "fsck failed: "
+#~ msgstr "montiranje nije uspelo"
+
+#~ msgid ""
+#~ "To enable a more secure system, you should select \"Use shadow file\" "
+#~ "and\n"
+#~ "\"Use MD5 passwords\"."
+#~ msgstr ""
+#~ "Da bi omogu�ili ve�u sigurnost sistema, izaberite \"Koristi shadow fajl\" "
+#~ "i\n"
+#~ "\"Use MD5 passwords\"."
+
+#~ msgid ""
+#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
+#~ "your\n"
+#~ "network administrator."
+#~ msgstr ""
+#~ "Ukoliko va� ra�unar koristi NIS, izaberite \"Koristi NIS\". Ukoliko "
+#~ "niste\n"
+#~ "sigurni kontaktirajte va�eg administratora."
+
+#~ msgid "yellow pages"
+#~ msgstr "�ute stranice"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "LAN konfiguracija"
+
+#~ msgid "Provider dns 1"
+#~ msgstr "Provajderov dns 1"
+
+#~ msgid "Provider dns 2"
+#~ msgstr "Provajderov dns 2"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "Kako �elite da se konektujete na internet ?"
 
 #~ msgid "cannot fork: "
 #~ msgstr "Ne mogu da fork-ujem:"
@@ -8578,9 +10501,6 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
 #~ msgid "loopback"
 #~ msgstr "povratno"
 
-#~ msgid "None"
-#~ msgstr "Nijedan"
-
 #~ msgid "Which bootloader(s) do you want to use?"
 #~ msgstr "Koji starter �elite da koristite ?"
 
@@ -8602,9 +10522,6 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
 #~ msgid "Configure local network"
 #~ msgstr "Podesi lokalni mre�u"
 
-#~ msgid "Disable networking"
-#~ msgstr "isklju�i  mre�u"
-
 #~ msgid "Configure the Internet connection / Configure local Network"
 #~ msgstr "Podesi Internet konekciju / podesi lokalni mre�u"
 
@@ -8652,9 +10569,6 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
 #~ msgid "Configure timezone"
 #~ msgstr "Podesi vremensku zonu"
 
-#~ msgid "Configure printer"
-#~ msgstr "Podesi �tampa�"
-
 #~ msgid "Network adaptater 1 (eth0):"
 #~ msgstr "Mre�ni adapter 1 (eth0):"
 
@@ -8764,9 +10678,6 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
 #~ msgid "Toggle between Installed and Available"
 #~ msgstr "Biraj izme�u Instalirano i Dostuno"
 
-#~ msgid "Uninstall"
-#~ msgstr "Deinstaliraj"
-
 #~ msgid "Choose package to install"
 #~ msgstr "Izaberi pakete za instalaciju"
 
@@ -8970,7 +10881,7 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili 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"
@@ -9019,7 +10930,7 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili 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"
@@ -9060,7 +10971,7 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
 #~ "- Ctrl-m  to set the mount point\n"
 #~ msgstr ""
 #~ "Sada, mo�ete izabrati na koju particiju(e) �elite instalirati\n"
-#~ "va� Linux-Mandrake sistem ukoliko je(su) ona unapred odre�ena(e)\n"
+#~ "va� Mandrake Linux sistem ukoliko je(su) ona unapred odre�ena(e)\n"
 #~ "(postoje�om Linux instalacijom ili nekim programom za particiranje "
 #~ "diska).\n"
 #~ "U drugim slu�ajevima particije na hard disku moraju biti definisane.\n"
@@ -9167,7 +11078,7 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili 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"
@@ -9194,7 +11105,7 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
 #~ "hardvera.\n"
 #~ "\n"
 #~ "\n"
-#~ "Ukoliko instalirate Linux-Mandrake sistem na ma�inu koja je deo "
+#~ "Ukoliko instalirate Mandrake Linux sistem na ma�inu koja je deo "
 #~ "postoje�e\n"
 #~ "mre�e, mre�ni administrator �e vam dati sve potrebne informacije\n"
 #~ "(IP adresu, ime ma�ine i dr.) Ukoliko pode�avate privatnu mre�u\n"
@@ -9402,9 +11313,6 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
 #~ msgid "nfs mount failed"
 #~ msgstr "nfs montiranje nije uspelo"
 
-#~ msgid "CHAP"
-#~ msgstr "CHAP"
-
 #~ msgid "Socket"
 #~ msgstr "Priklju�ak"
 
@@ -9510,9 +11418,6 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
 #~ msgid "%s: This is not a root partition, please select another one."
 #~ msgstr "%s: Ovo nije root particija, izaberite neku drugu."
 
-#~ msgid "No root partition found"
-#~ msgstr "Nema root particije"
-
 #~ msgid "Please choose a partition to use as your root partition."
 #~ msgstr "Izaberite koju particiju �elite da korisite kao root particiju"
 
@@ -9642,9 +11547,6 @@ msgstr "Set alata za el.po�tu, vesti, web, transfer datoteka, ili chat"
 #~ msgid "useless"
 #~ msgstr "beskorisno"
 
-#~ msgid "garbage"
-#~ msgstr "�ubre"
-
 #~ msgid "Do you want to use LILO?"
 #~ msgstr "Da li �elite da koristite LILO ?"
 
diff --git a/perl-install/share/po/sv.po b/perl-install/share/po/sv.po
index a3c214b81..9deb340be 100644
--- a/perl-install/share/po/sv.po
+++ b/perl-install/share/po/sv.po
@@ -4,71 +4,73 @@
 # Robert Jungstedt <master@linux.nu>, 1999
 # David Hedbor <david@hedbor.org>, 2000
 # Egil M�ller <redhog@mandrakesoft.com>, 2000
-# Mattias Dahlberg <voz@home.se>, 2001
+# Mattias Dahlberg <voz@home.se>, 2001.
+# Mattias Newzella <newzella@linux.nu>, 2001.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-02 17:16+0200\n"
-"PO-Revision-Date: 2001-04-14 19:13+0100\n"
-"Last-Translator: Mattias Dahlberg <voz@home.se>\n"
-"Language-Team: Swedish <>\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
+"PO-Revision-Date: 2001-09-21 14:13GMT\n"
+"Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
+"Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.9.5\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
 msgstr "Konfigurera alla huvuden individuellt"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Anv�nd Xinerama"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
-msgstr "Konfigurera bara kort \"%s\" (%s)"
+msgstr "Konfigurera endast kort \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
-msgstr "Konfigurera Multi-Head"
+msgstr "Konfigurera \"multi-head\""
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
-"Ditt system st�der multi-head-konfiguration.\n"
+"Ditt system st�der \"multi-head\"-konfiguration.\n"
 "Vad vill du g�ra?"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Graphic card"
 msgstr "Grafikkort"
 
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfigurator.pm_.c:248
 msgid "Select a graphic card"
 msgstr "V�lj ett grafikkort"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "Choose a X server"
 msgstr "V�lj en 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 "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:312
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
-msgstr "Vilken XFree-konfiguration vill du ha?"
+msgstr "Vilken XFree-konfiguration vill du anv�nda?"
 
-#: ../../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"
@@ -77,31 +79,32 @@ msgstr ""
 "Ditt kort kan f� h�rdvarust�d f�r 3D-acceleration, men bara med XFree %s.\n"
 "Ditt kort st�ds av XFree %s, som kan vara b�ttre f�r 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 "Ditt kort kan f� h�rdvarust�d f�r 3D-acceleration med 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 med h�rdvarubaserad 3D-acceleration"
 
-#: ../../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 ""
 "Ditt kort kan f� h�rdvarust�d f�r 3D-acceleration med XFree %s,\n"
-"OBS DETTA �R EXPERIMENTELLT ST�D OCH KAN H�NGA DIN DATOR."
+"OBSERVERA: DETTA �R EXPERIMENTELLT ST�D OCH KAN H�NGA DIN DATOR."
 
-#: ../../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 med EXPERIMENTELLT h�rdvarust�d f�r 3D-acceleration."
 
-#: ../../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,30 +112,34 @@ msgid ""
 "Your card is supported by XFree %s which may have a better support in 2D."
 msgstr ""
 "Ditt kort kan f� h�rdvarust�d f�r 3D-acceleration, men bara med XFree %s,\n"
-"OBS DETTA �R EXPERIMENTELLT ST�D OCH KAN H�NGA DIN DATOR.\n"
+"OBSERVERA: DETTA �R EXPERIMENTELLT ST�D OCH KAN H�NGA DIN DATOR.\n"
 "Ditt kort st�ds av XFree %s som kan vara b�ttre f�r 2D."
 
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr "Xpmac (sk�rmdrivrutin installation)"
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "XFree-konfiguration"
 
-#: ../../Xconfigurator.pm_.c:416
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "V�lj minnesstorlek p� ditt grafikkort"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "V�lj inst�llningar f�r server"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
-msgstr "V�lj en monitor"
+msgstr "V�lj en bildsk�rm"
 
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
-msgstr "Monitor"
+msgstr "Bildsk�rm"
 
-#: ../../Xconfigurator.pm_.c:483
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -145,49 +152,48 @@ msgid ""
 "monitor.\n"
 " If in doubt, choose a conservative setting."
 msgstr ""
-"De tv� mest kritiska v�rdena �r den vertikala uppdateringsfrekvensen, som "
-"�r\n"
-"den hastighet som hela sk�rmen uppdateras i, och framf�rallt den "
-"horisontella\n"
-"synchastigheten, som �r det hastighen som scan-linjerna visas i.\n"
+"De tv� mest kritiska v�rdena �r den vertikala uppdateringsfrekvensen,\n"
+"som �r den hastighet som hela sk�rmen uppdateras i, och framf�rallt\n"
+"den horisontella synkroniseringshastigheten, som �r den hastighet som\n"
+"scan-linjerna visas i.\n"
 "\n"
-"Det �r V�LDIGT VIKTIGT att du inte v�ljer v�rden f�r en monitortyp som g�r\n"
-"utanf�r kapaciteten f�r din egen bildsk�rm: du kan d� f�rst�ra sk�rmen.\n"
-"Vid os�kerhet, v�lj konservativa v�rden."
+"Det �r V�LDIGT VIKTIGT att du inte v�ljer v�rden f�r en sk�rmtyp som g�r\n"
+"utanf�r kapaciteten f�r din egen bildsk�rm; du kan d� f�rst�ra sk�rmen.\n"
+"V�lj konservativa v�rden om du �r os�ker."
 
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "Horisontell uppdateringsfrekvens"
 
-#: ../../Xconfigurator.pm_.c:491
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "Vertikal uppdateringsfrekvens"
 
-#: ../../Xconfigurator.pm_.c:528
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
-msgstr "Monitor ej konfigurerad"
+msgstr "Bildsk�rm ej konfigurerad"
 
-#: ../../Xconfigurator.pm_.c:531
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "Grafikkortet �r inte konfigurerat �nnu"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
-msgstr "Uppl�sningar ej valda �n"
+msgstr "Uppl�sningar ej valda �nnu"
 
-#: ../../Xconfigurator.pm_.c:551
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
-msgstr "Vill du testa konfigurationen?"
+msgstr "Vill du prova konfigurationen?"
 
-#: ../../Xconfigurator.pm_.c:555
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
-msgstr "Varning: att testa detta grafikkort kan h�nga din dator"
+msgstr "Varning: att prova detta grafikkort kan h�nga din dator"
 
-#: ../../Xconfigurator.pm_.c:558
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "Test av konfigurationen"
 
-#: ../../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"
 "f�rs�k �ndra n�gra parametrar"
 
-#: ../../Xconfigurator.pm_.c:597
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "Ett fel uppstod:"
 
-#: ../../Xconfigurator.pm_.c:619
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Avslutar om %d sekunder"
 
-#: ../../Xconfigurator.pm_.c:630
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "�r detta korrekt inst�llning?"
 
-#: ../../Xconfigurator.pm_.c:638
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
-msgstr "Ett fel uppstod, f�rs�k att �ndra n�gra parametrar"
+msgstr "Ett fel uppstod, f�rs�k att �ndra n�gra parametrar."
 
-#: ../../Xconfigurator.pm_.c:684 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "Uppl�sning"
 
-#: ../../Xconfigurator.pm_.c:731
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "V�lj uppl�sning och f�rgdjup"
 
-#: ../../Xconfigurator.pm_.c:733
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafikkort: %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 "Expertl�ge"
 
-#: ../../Xconfigurator.pm_.c:751
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "Visa alla"
 
-#: ../../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "Uppl�sningar"
 
-#: ../../Xconfigurator.pm_.c:1330
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tangentbordslayout: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Mustyp: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1332
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Musenhet: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1333
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
-msgstr "Monitor: %s\n"
+msgstr "Bildsk�rm: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1334
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
-msgstr "Monitor HoriSynk: %s\n"
+msgstr "Bildsk�rm horisynk: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1335
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
-msgstr "Monitor VertUppdatering: %s\n"
+msgstr "Bildsk�rm vertuppdatering: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1336
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafikkort: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1337
+#: ../../Xconfigurator.pm_.c:1444
+#, c-format
+msgid "Graphic card identification: %s\n"
+msgstr "Grafikkortsidentifiering: %s\n"
+
+#: ../../Xconfigurator.pm_.c:1445
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Grafikminne: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1339
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "F�rgdjup: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1340
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Uppl�sning: %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-drivrutin: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "F�rbereder konfiguration av X-Windows"
 
-#: ../../Xconfigurator.pm_.c:1382
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "Vad vill du g�ra?"
 
-#: ../../Xconfigurator.pm_.c:1387
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
-msgstr "Byt Monitor"
+msgstr "�ndra bildsk�rm"
 
-#: ../../Xconfigurator.pm_.c:1388
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
-msgstr "Byt grafikkort"
+msgstr "�ndra grafikkort"
 
-#: ../../Xconfigurator.pm_.c:1390
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "�ndra serverinst�llningar"
 
-#: ../../Xconfigurator.pm_.c:1391
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "�ndra uppl�sning"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "Visa information"
 
-#: ../../Xconfigurator.pm_.c:1393
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "Testa igen"
 
-#: ../../Xconfigurator.pm_.c:1394 ../../bootlook.pm_.c:238
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../../Xconfigurator.pm_.c:1402
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -348,31 +358,31 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Beh�lla �ndringar?\n"
-"Nuvarande konfiguration �r:\n"
+"Beh�lla �ndringarna?\n"
+"Aktuell konfiguration �r:\n"
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1423
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
-msgstr "Logga in i %s igen f�r att aktivera f�r�ndringarna"
+msgstr "Logga in i %s igen f�r att aktivera �ndringarna."
 
-#: ../../Xconfigurator.pm_.c:1443
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "Logga ut och anv�nd sedan Ctrl-Alt-BackSpace"
+msgstr "Logga ut och anv�nd sedan Ctrl-Alt-Backsteg"
 
-#: ../../Xconfigurator.pm_.c:1446
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "X vid uppstart"
 
-#: ../../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 ""
-"Jag kan st�lla in din dator att automatiskt starta X vid uppstart.\n"
-"Vill du att X ska starta n�r du bootar?"
+"Din dator kan st�llas in s� att X startas automatiskt vid uppstart.\n"
+"Vill du att X ska starta n�r du startar om?"
 
 #: ../../Xconfigurator_consts.pm_.c:6
 msgid "256 colors (8 bits)"
@@ -419,362 +429,369 @@ msgid "8 MB"
 msgstr "8 MB"
 
 #: ../../Xconfigurator_consts.pm_.c:112
-msgid "16 MB or more"
-msgstr "16 MB eller mer"
+msgid "16 MB"
+msgstr "16 MB"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:113
+msgid "32 MB"
+msgstr "32 MB"
+
+#: ../../Xconfigurator_consts.pm_.c:114
+msgid "64 MB or more"
+msgstr "64 MB eller mer"
+
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "Standard VGA, 640x480 i 60 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:121
+#: ../../Xconfigurator_consts.pm_.c:123
 msgid "Super VGA, 800x600 at 56 Hz"
 msgstr "Super VGA, 800x600 i 56 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:122
+#: ../../Xconfigurator_consts.pm_.c:124
 msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
 msgstr "8514 kompatibel, 1024x768 i 87 Hz interlaced (ingen 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 interlaced, 800x600 i 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 i 60 Hz, 640x480 i 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 i 60 Hz, 800x600 i 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 i 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 som klarar 1280x1024 i 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 som klarar 1280x1024 i 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 som klarar 1280x1024 i 76 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:130
+#: ../../Xconfigurator_consts.pm_.c:132
 msgid "Monitor that can do 1600x1200 at 70 Hz"
-msgstr "Monitor som klarar 1600x1200 i 70 Hz"
+msgstr "Bildsk�rm som klarar 1600x1200 i 70 Hz"
 
-#: ../../Xconfigurator_consts.pm_.c:131
+#: ../../Xconfigurator_consts.pm_.c:133
 msgid "Monitor that can do 1600x1200 at 76 Hz"
-msgstr "Monitor som klarar 1600x1200 i 76 Hz"
+msgstr "Bildsk�rm som klarar 1600x1200 i 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 "F�rsta sektorn p� bootpartitionen"
+msgstr "F�rsta sektorn p� startpartitionen"
 
-#: ../../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 "F�rsta sektorn p� disken (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:100
 msgid "SILO Installation"
 msgstr "SILO-installation"
 
-#: ../../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 "Var vill du lagra bootladdaren?"
+msgstr "Var vill du installera starthanteraren?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:113
 msgid "LILO/grub Installation"
-msgstr "LILO/grub-installation"
+msgstr "Installation av 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 med textbaserad meny"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO med grafikbaserad meny"
 
-#: ../../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 "Starta fr�n 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 "Bootladdarens huvudalternativ"
+msgstr "Starthanterarens huvudalternativ"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
-msgstr "Bootladdare att anv�nda"
+msgstr "Starthanterare som ska anv�ndas"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
-msgstr "Bootladdarinstallation"
+msgstr "Installation av starthanterare"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:150 ../../any.pm_.c:180
 msgid "Boot device"
-msgstr "Bootenhet"
+msgstr "Startenhet"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:151
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (fungerar inte med gamla BIOS)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Kompakt"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "kompakt"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:256
+#: ../../any.pm_.c:153 ../../any.pm_.c:250
 msgid "Video mode"
 msgstr "Videol�ge"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:155
 msgid "Delay before booting default image"
-msgstr "F�rdr�jning innan standard-image startar"
+msgstr "F�rdr�jning innan f�rvald avbild startar"
 
-#: ../../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 "L�senord"
 
-#: ../../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 "L�senord (en g�ng till)"
+msgstr "L�senord (bekr�fta)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "Restrict command line options"
 msgstr "Begr�nsa alternativen f�r kommandoraden"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:159
 msgid "restrict"
 msgstr "begr�nsa"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:161
 msgid "Clean /tmp at each boot"
 msgstr "Rensa /tmp vid varje uppstart"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
-msgstr "Ange RAM-storlek, om det beh�vs (hittade %d MB)"
+msgstr "Ange RAM-storlek, om n�dv�ndigt (hittade %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
-msgstr "Sl� p� anv�ndning av flera profiler"
+msgstr "Aktivera anv�ndning av flera profiler"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:168
 msgid "Give the ram size in MB"
 msgstr "Ange RAM-storlek i MB"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:170
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
-"Alternativet ''Begr�nsa alternativen f�r kommandoraden'' �r v�rdel�st utan "
-"l�senord"
+"Alternativet \"Begr�nsa alternativen f�r kommandoraden\" �r v�rdel�st utan "
+"l�senord."
 
-#: ../../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 "F�rs�k igen"
 
-#: ../../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 "Du angav inte samma l�senord"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "Init Message"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Open Firmware-f�rdr�jning"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Kernel Boot Timeout"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
-msgstr "Aktivera CD-boot?"
+msgstr "Aktivera CD-start?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
-msgstr "Aktivera OF-boot?"
+msgstr "Aktivera OF-start?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Standard-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 ""
-"F�ljande alternativ finns.\n"
+"F�ljande poster finns.\n"
 "Du kan l�gga till fler eller �ndra p� befintliga."
 
-#: ../../any.pm_.c:220 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "L�gg till"
 
-#: ../../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 "F�rdig"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:217
 msgid "Modify"
 msgstr "�ndra"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
-msgstr "Vilket sorts entry vill du l�gga till?"
+msgstr "Vilket sorts post vill du l�gga till?"
 
-#: ../../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 "Annat OS (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "Annat OS (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
-msgstr "Annat OS (windows...)"
+msgstr "Annat OS (Windows...)"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:252
+#: ../../any.pm_.c:246
 msgid "Image"
-msgstr "Image"
+msgstr "Avbild"
 
-#: ../../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 "L�gg till"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:259
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "L�s-skriv"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Tabell"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Os�ker"
 
-#: ../../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 "Etikett"
 
-#: ../../any.pm_.c:276 ../../any.pm_.c:287
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Standard"
 
-#: ../../any.pm_.c:284
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Initrd-storlek"
 
-#: ../../any.pm_.c:286
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:288
 msgid "Remove entry"
-msgstr "Ta bort entry"
+msgstr "Ta bort post"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
-msgstr "Tom etikett inte till�ten"
+msgstr "Tom etikett till�ts inte"
 
-#: ../../any.pm_.c:298
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "Denna etikett anv�nds redan"
 
-#: ../../any.pm_.c:317
-msgid "What type of partitioning?"
-msgstr "Vilken typ av partitionering?"
-
-#: ../../any.pm_.c:608
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
-msgstr "Hittade %s %s interface"
+msgstr "Hittade %s %s gr�nssnitt"
 
-#: ../../any.pm_.c:609
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "Har du ett till?"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
-msgstr "Har du n�got %s interface?"
+msgstr "Har du n�got %s-gr�nssnitt?"
 
-#: ../../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 "Nej"
 
-#: ../../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 "Visa h�rdvaruinfo"
+msgstr "Visa h�rdvaruinformation"
 
 #. -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 "Installerar drivrutin f�r %s kort %s"
 
-#: ../../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 "Vilken %s drivrutin skall jag prova?"
+msgstr "Vilken %s drivrutin ska provas?"
 
-#: ../../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"
@@ -785,28 +802,26 @@ msgid ""
 "should\n"
 "not cause any damage."
 msgstr ""
-"I vissa fall, beh�ver drivrutinen %s extra information f�r att fungera "
-"korrekt.\n"
-"Vanligtvis fungerar det �nd�. Vill du specificera extra info eller l�ta "
-"drivrutinen\n"
-"leta efter informationen sj�lv? Ibland kan s�kningen l�sa datorn, men det "
-"ska inte\n"
+"I vissa fall beh�ver drivrutinen %s extra information f�r att fungera\n"
+"korrekt. Vanligtvis fungerar det �nd�. Vill du specificera extra\n"
+"information eller l�ta drivrutinen leta efter informationen sj�lv?\n"
+"Ibland kan s�kningen l�sa datorn, men det ska inte\n"
 "st�lla till med n�gon skada."
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
-msgstr "Testa automatiskt"
+msgstr "Prova automatiskt"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "Ange alternativ"
 
-#: ../../any.pm_.c:677
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Du kan nu ange parametrar till modulen %s"
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -814,49 +829,50 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 "Du kan nu ange parametrar till modulen %s.\n"
-"Parametrar i formatet ''name=value name2=value2 ...''.\n"
-"Till exempel, ''io=0x300 irq=7''"
+"Parametrar i formatet \"name=value name2=value2...\".\n"
+"Till exempel, \"io=0x300 irq=7\""
 
-#: ../../any.pm_.c:686
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "Modulalternativ:"
 
-#: ../../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 ""
-"Modul %s kunde inte laddas.\n"
+"Modulen %s kunde inte laddas.\n"
 "Vill du f�rs�ka igen med andra parametrar?"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(finns redan %s)"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "Ditt l�senord �r f�r enkelt"
 
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "Ange ett anv�ndarnamn"
 
-#: ../../any.pm_.c:721
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "Anv�ndernamnet f�r endast inneh�lla sm� bokst�ver, siffror,'-' och '_'"
+msgstr ""
+"Anv�ndarnamnet f�r endast inneh�lla sm� bokst�ver, siffror,\"-\" och \"_\""
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
-msgstr "Det h�r anv�ndernamnet finns redan"
+msgstr "Det h�r anv�ndarnamnet finns redan"
 
-#: ../../any.pm_.c:726
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "L�gg till anv�ndare"
 
-#: ../../any.pm_.c:727
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -865,49 +881,63 @@ msgstr ""
 "Ange en anv�ndare\n"
 "%s"
 
-#: ../../any.pm_.c:728
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "Acceptera anv�ndare"
 
-#: ../../any.pm_.c:739
+#: ../../any.pm_.c:728
 msgid "Real name"
-msgstr "Fullt namn"
+msgstr "Fullst�ndigt namn"
 
-#: ../../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 "Anv�ndarnamn"
 
-#: ../../any.pm_.c:743
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "Skal"
 
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:756
 msgid "Autologin"
-msgstr "Autologin"
+msgstr "Automatisk inloggning"
 
-#: ../../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 ""
-"Jag kan s�tta upp din dator att automatiskt logga in en anv�ndare.\n"
-"Om du inte �nskar denna funktion, klicka p� knappen avbryt."
+"Din dator kan konfigureras s� att den automatiskt loggar in en anv�ndare.\n"
+"Vill du anv�nda denna funktion?"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "V�lj standardanv�ndare:"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
-msgstr "V�lj f�nsterhanterare att anv�nda:"
+msgstr "V�lj f�nsterhanteraren som ska anv�ndas:"
+
+#: ../../any.pm_.c:771
+msgid "Please, choose a language to use."
+msgstr "V�lj spr�ket som ska anv�ndas."
+
+#: ../../any.pm_.c:773
+msgid "You can choose other languages that will be available after install"
+msgstr ""
+"Du kan v�lja ytterligare spr�k som ska finnas tillg�ngliga efter "
+"installationen."
+
+#: ../../any.pm_.c:785 ../../install_steps_interactive.pm_.c:633
+msgid "All"
+msgstr "Alla"
 
 #. -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"
@@ -919,894 +949,1022 @@ msgstr ""
 "V�lkommen till operativsystemv�ljaren %s!\n"
 "\n"
 "V�lj ett operativsystem i listan ovan eller\n"
-"v�nta i %d sekunder f�r standardboot.\n"
+"v�nta i %d sekunder f�r standardstart.\n"
 "\n"
 
 #. -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 "V�lkommen till operativsystemv�ljaren 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 "Anv�nd tangenterna %c och %c f�r att v�lja vad som ska markeras."
 
 #. -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 "Tryck Enter f�r att starta valt operativsystem, 'e' f�r att editera"
+msgstr ""
+"Tryck Enter f�r att starta valt operativsystem, \"e\" f�r att redigera."
 
 #. -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 "kommandon innan start, eller 'c' f�r kommandorad."
+msgstr "kommandon innan start, eller \"c\" f�r kommandorad."
 
 #. -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 "Markerat alternativ kommer att starta automatiskt om %d sekunder."
 
-#: ../../bootloader.pm_.c:825
+#: ../../bootloader.pm_.c:851
 msgid "not enough room in /boot"
 msgstr "inte tillr�ckligt utrymme p� /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 "Startmeny"
 
+#: ../../bootloader.pm_.c:972
+#, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Du kan inte installera starthanteraren p� en %s partition.\n"
+
 #: ../../bootlook.pm_.c:46
 msgid "no help implemented yet.\n"
-msgstr "ingen hj�lp finns implementerad �n.\n"
+msgstr "ingen hj�lp finns implementerad �nnu.\n"
 
 #: ../../bootlook.pm_.c:62
 msgid "Boot Style Configuration"
-msgstr "Konfiguration f�r bootutf�rande"
+msgstr "Konfiguration av startutf�rande"
 
 #: ../../bootlook.pm_.c:79
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/Arkiv/_Nytt"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/Arkiv/_�ppna"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/Arkiv/_Spara"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/Arkiv/Spara_som"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/Arkiv/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/Arkiv/_Avsluta"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Alternativ"
-
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Alternativ/Test"
-
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_Hj�lp"
-
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/Hj�lp/_Om..."
-
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Konfigurera"
-
-#: ../../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 ""
-"Du anv�nder f�r n�rvarande %s som boothanterare.\n"
-"Klicka p� Konfigurera f�r att starta inst�llningsguiden."
-
-#: ../../bootlook.pm_.c:121
-msgid "Lilo/grub mode"
-msgstr "Lilo/Grub-l�ge"
-
-#: ../../bootlook.pm_.c:131
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
-msgstr "NewStyle kategoriseringsmonitor"
+msgstr "Ny stil kategoriseringsmonitor"
 
-#: ../../bootlook.pm_.c:134
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
-msgstr "NewStyle monitor"
+msgstr "Ny stil monitor"
 
-#: ../../bootlook.pm_.c:137
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "Traditionell monitor"
 
-#: ../../bootlook.pm_.c:140
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "Traditionell Gtk+-monitor"
 
-#: ../../bootlook.pm_.c:144
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "K�r Aurora vid uppstart"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/Grub-l�ge"
+
+#: ../../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 ""
+"Du anv�nder f�r n�rvarande %s som starthanterare.\n"
+"Klicka p� \"Konfigurera\" f�r att starta inst�llningsguiden."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Konfigurera"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
-msgstr "Bootl�ge"
+msgstr "Startl�ge"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Systeml�ge"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "K�r X-Window-systemet vid start"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
-msgstr "Nej, jag vill inte ha autologin"
+msgstr "Nej, jag vill inte ha automatisk inloggning"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "Ja, jag vill ha autologin med denna (anv�ndare, skrivbordsmilj�)"
-
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "Systeml�ge"
-
-#: ../../bootlook.pm_.c:228
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Standard"
+msgstr ""
+"Ja, jag vill ha automatisk inloggning med denna (anv�ndare, skrivbordsmilj�)"
 
-#: ../../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 "Avbryt"
 
-#: ../../bootlook.pm_.c:315
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "Kan inte �ppna /etc/inittab f�r l�sning: $!"
-
-#: ../../bootlook.pm_.c:369
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "kan inte �ppna /etc/sysconfig/autologin f�r l�sning: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "Kan inte �ppna /etc/inittab f�r l�sning: %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 "Installationen av LILO misslyckades. F�ljande fel uppstod:"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "Skapa"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "Avmontera"
+#: ../../common.pm_.c:93
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "Radera"
+#: ../../common.pm_.c:93
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "Formatera"
+#: ../../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 "�ndra storlek"
+#: ../../common.pm_.c:101
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "Typ"
+#: ../../common.pm_.c:109
+#, c-format
+msgid "%d minutes"
+msgstr "%d minuter"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "Monteringspunkt"
+#: ../../common.pm_.c:111
+msgid "1 minute"
+msgstr "1 minut"
 
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "Skriv /etc/fstab"
+#: ../../common.pm_.c:113
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekunder"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "Byt till expertl�ge"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "S�kerhetskopiera din data f�rst"
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to normal mode"
-msgstr "Byt till normall�ge"
+#: ../../diskdrake.pm_.c:100 ../../diskdrake_interactive.pm_.c:801
+#: ../../diskdrake_interactive.pm_.c:810 ../../diskdrake_interactive.pm_.c:864
+msgid "Read carefully!"
+msgstr "L�s noggrant!"
 
-#: ../../diskdrake.pm_.c:41
-msgid "Restore from file"
-msgstr "�terst�ll fr�n fil"
+#: ../../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 ""
+"Om du t�nker anv�nda aboot, se till att l�mna ledigt utrymme (2048 sektorer "
+"r�cker)\n"
+"i b�rjan av disken."
 
-#: ../../diskdrake.pm_.c:42
-msgid "Save in file"
-msgstr "Spara till fil"
+#: ../../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 "Fel"
 
-#: ../../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:159
 msgid "Wizard"
 msgstr "Guide"
 
-#: ../../diskdrake.pm_.c:44
-msgid "Restore from floppy"
-msgstr "�terst�ll fr�n diskett"
+#: ../../diskdrake.pm_.c:181
+msgid "New"
+msgstr "Ny"
 
-#: ../../diskdrake.pm_.c:45
-msgid "Save on floppy"
-msgstr "Spara p� diskett"
+#: ../../diskdrake.pm_.c:203 ../../diskdrake.pm_.c:206
+msgid "Remote"
+msgstr "Fj�rr"
 
-#: ../../diskdrake.pm_.c:49
-msgid "Clear all"
-msgstr "Nollst�ll"
+#: ../../diskdrake.pm_.c:208 ../../diskdrake.pm_.c:479
+#: ../../diskdrake_interactive.pm_.c:352 ../../diskdrake_interactive.pm_.c:523
+msgid "Mount point"
+msgstr "Monteringspunkt"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-msgstr "Formatera alla"
+#: ../../diskdrake.pm_.c:209
+msgid "Options"
+msgstr "Alternativ"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Auto allocate"
-msgstr "Allokera automatiskt"
+#: ../../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 "Typ"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "Alla prim�ra partitioner anv�nds"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "Avmontera"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-msgstr "Jag kan inte l�gga till fler partitioner"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "Montera"
 
-#: ../../diskdrake.pm_.c:59
+#: ../../diskdrake.pm_.c:228
+msgid "Choose action"
+msgstr "V�lj �tg�rd"
+
+#: ../../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 ""
-"F�r att f� fler partitioner, var god radera en f�r att sedan kunna skapa en "
-"ut�kad partition"
+"Du har en stor FAT-partition\n"
+"(normalt anv�nt av Microsoft DOS/Windows).\n"
+"Du rekommenderas att �ndra storleken p� den partitionen.\n"
+"(Klicka p� den och klicka sedan p� \"�ndra storlek\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "Inte tillr�ckligt med utrymme f�r autoallokering"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "Klicka p� en partition"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "�ngra"
+#: ../../diskdrake.pm_.c:240
+msgid "Please click on a media"
+msgstr "Klicka p� ett media"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "Skriv partitionstabellen"
+#: ../../diskdrake.pm_.c:243
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr ""
+"Klicka p� en knapp ovan\n"
+"\n"
+"Eller anv�nd \"Ny\"."
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "Mer"
+#: ../../diskdrake.pm_.c:244
+msgid "Use \"New\""
+msgstr "Anv�nd \"Ny\""
+
+#: ../../diskdrake.pm_.c:263 ../../install_steps_gtk.pm_.c:517
+msgid "Details"
+msgstr "Detaljer"
 
-#: ../../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
+msgid "Journalised FS"
+msgstr "Journalf�rande fs"
+
+#: ../../diskdrake.pm_.c:395
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:116
+#: ../../diskdrake.pm_.c:395
 msgid "Swap"
-msgstr "Swap"
+msgstr "V�xlingsutrymme"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:396 ../../diskdrake_interactive.pm_.c:952
 msgid "Empty"
 msgstr "Tom"
 
-#: ../../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 "Annan"
 
-#: ../../diskdrake.pm_.c:123
+#: ../../diskdrake.pm_.c:400
 msgid "Filesystem types:"
 msgstr "Filsystemtyper:"
 
-#: ../../diskdrake.pm_.c:132 ../../install_steps_gtk.pm_.c:577
-msgid "Details"
-msgstr "Detaljer"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake_interactive.pm_.c:375
+msgid "Create"
+msgstr "Skapa"
 
-#: ../../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 ""
-"Du har en stor FAT-partition\n"
-"(normalt anv�nt av Microsoft DOS/Windows).\n"
-"Jag f�resl�r att du �ndrar storleken p� den partitionen.\n"
-"(Klicka p� den och klicka sedan p� \"�ndra storlek\")"
+#: ../../diskdrake.pm_.c:417 ../../diskdrake.pm_.c:419
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Anv�nd \"%s\" i st�llet"
 
-#: ../../diskdrake.pm_.c:152
-msgid "Please make a backup of your data first"
-msgstr "Var god s�kerhetskopiera dina data f�rst"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "Ta bort"
 
-#: ../../diskdrake.pm_.c:152 ../../diskdrake.pm_.c:170
-#: ../../diskdrake.pm_.c:179 ../../diskdrake.pm_.c:570
-#: ../../diskdrake.pm_.c:592
-msgid "Read carefully!"
-msgstr "L�s noggrant!"
+#: ../../diskdrake.pm_.c:423
+msgid "Use ``Unmount'' first"
+msgstr "Anv�nd \"Unmount\" f�rst"
 
-#: ../../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 ""
-"Om du t�nker anv�nda aboot, se till att l�mna ledigt utrymme (2048 sektorer "
-"r�cker)\n"
-"i b�rjan av disken"
+"Efter �ndring av partitionstyp %s kommer all data p� denna partition att "
+"f�rsvinna."
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "Var f�rsiktig: Detta moment �r farligt"
+#: ../../diskdrake.pm_.c:478 ../../diskdrake_interactive.pm_.c:522
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Var vill du montera enheten %s?"
 
-#: ../../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 "Fel"
+#: ../../diskdrake.pm_.c:500
+msgid "Mount options"
+msgstr "Monteringsalternativ"
 
-#: ../../diskdrake.pm_.c:238 ../../diskdrake.pm_.c:748
-msgid "Mount point: "
-msgstr "Monteringspunkt:"
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
+msgstr "Diverse"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:298
-msgid "Device: "
-msgstr "Enhet:"
+#: ../../diskdrake.pm_.c:525
+msgid "Removable media"
+msgstr "Flyttningsbar media"
 
-#: ../../diskdrake.pm_.c:240
-#, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS-enhetsbokstav: %s (bara en gissning)\n"
+#: ../../diskdrake.pm_.c:532
+msgid "Change type"
+msgstr "�ndra typ"
 
-#: ../../diskdrake.pm_.c:244 ../../diskdrake.pm_.c:251
-#: ../../diskdrake.pm_.c:301
-msgid "Type: "
-msgstr "Typ: "
+#: ../../diskdrake.pm_.c:533 ../../diskdrake_interactive.pm_.c:487
+msgid "Which filesystem do you want?"
+msgstr "Vilket filsystem vill du anv�nda?"
 
-#: ../../diskdrake.pm_.c:248
-msgid "Name: "
-msgstr "Namn: "
+#: ../../diskdrake.pm_.c:564
+msgid "Scanning available nfs shared resource"
+msgstr "S�ker tillg�ngliga nfs-utdelade resurser"
 
-#: ../../diskdrake.pm_.c:253
+#: ../../diskdrake.pm_.c:569
 #, c-format
-msgid "Start: sector %s\n"
-msgstr "Start: sector %s\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr "S�ker tillg�ngliga nfs-utdelade resurser p� server %s"
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Size: %s"
-msgstr "Storlek: %s"
+#: ../../diskdrake.pm_.c:578 ../../diskdrake.pm_.c:648
+msgid "If the list above doesn't contain the wanted entry, enter it here:"
+msgstr "Om listan ovan inte inneh�ller posten du vill ha, ange den h�r:"
 
-#: ../../diskdrake.pm_.c:256
-#, c-format
-msgid ", %s sectors"
-msgstr ", %s sektorer"
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:651
+msgid "Server"
+msgstr "Server"
 
-#: ../../diskdrake.pm_.c:258
+#: ../../diskdrake.pm_.c:582 ../../diskdrake.pm_.c:652
+msgid "Shared resource"
+msgstr "Delad resurs"
+
+#: ../../diskdrake.pm_.c:615
+msgid "Scanning available samba shared resource"
+msgstr "S�ker tillg�ngliga Samba-utdelade resurser"
+
+#: ../../diskdrake.pm_.c:626 ../../diskdrake.pm_.c:639
 #, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Cylinder %d till cylinder %d\n"
+msgid "Scanning available samba shared resource of server %s"
+msgstr "S�ker tillg�ngliga Samba-utdelade resurser p� server %s"
 
-#: ../../diskdrake.pm_.c:259
-msgid "Formatted\n"
-msgstr "Formaterad\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose a partition"
+msgstr "V�lj en partition"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Not formatted\n"
-msgstr "Ej formaterad\n"
+#: ../../diskdrake_interactive.pm_.c:163
+msgid "Choose another partition"
+msgstr "V�lj en annan partition"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Mounted\n"
-msgstr "Monterad\n"
+#: ../../diskdrake_interactive.pm_.c:188
+msgid "Exit"
+msgstr "Avsluta"
 
-#: ../../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 "Byt till expertl�ge"
 
-#: ../../diskdrake.pm_.c:264
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback-filer: %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Toggle to normal mode"
+msgstr "Byt till normall�ge"
 
-#: ../../diskdrake.pm_.c:265
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"F�rvald partition f�r uppstart\n"
-"    (f�r MS-DOS boot, inte f�r lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "�ngra"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "Niv� %s\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "Forts�tta �nd�?"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Blockstorlek %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "Avsluta utan att spara"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-diskar %s\n"
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "Avsluta utan att skriva partitionstabellen?"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Loopback-filnamn: %s"
+#: ../../diskdrake_interactive.pm_.c:237
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Vill du spara /etc/fstab-�ndringar"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Auto allocate"
+msgstr "Allokera automatiskt"
+
+#: ../../diskdrake_interactive.pm_.c:247
+msgid "Clear all"
+msgstr "Nollst�ll"
+
+#: ../../diskdrake_interactive.pm_.c:247
+#: ../../install_steps_interactive.pm_.c:171
+msgid "More"
+msgstr "Mer"
+
+#: ../../diskdrake_interactive.pm_.c:250
+msgid "Hard drive information"
+msgstr "Information om h�rddisk"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "Not enough space for auto-allocating"
+msgstr "Inte tillr�ckligt med utrymme f�r automatisk allokering."
 
-#: ../../diskdrake.pm_.c:274
+#: ../../diskdrake_interactive.pm_.c:273
+msgid "All primary partitions are used"
+msgstr "Alla prim�ra partitioner anv�nds"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "Det g�r inte att l�gga till fler partitioner"
+
+#: ../../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"
-"Chansen finns att denna partition\n"
-"�r en drivrutinspartition, du b�r\n"
-"antagligen l�mna den i fred.\n"
+"F�r att f� fler partitioner, ta bort en f�r att sedan kunna skapa en ut�kad "
+"partition."
+
+#: ../../diskdrake_interactive.pm_.c:285
+msgid "Save partition table"
+msgstr "Spara partitionstabell"
+
+#: ../../diskdrake_interactive.pm_.c:286
+msgid "Restore partition table"
+msgstr "�terskapa partitionstabell"
+
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "R�dda partitionstabell"
+
+#: ../../diskdrake_interactive.pm_.c:289
+msgid "Reload partition table"
+msgstr "Ladda om partitionstabell"
+
+#: ../../diskdrake_interactive.pm_.c:293
+msgid "Removable media automounting"
+msgstr "Automatisk montering av flyttningsbar media"
 
-#: ../../diskdrake.pm_.c:277
+#: ../../diskdrake_interactive.pm_.c:301 ../../diskdrake_interactive.pm_.c:321
+msgid "Select file"
+msgstr "V�lj fil"
+
+#: ../../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"
-"Denna speciella Bootstrap-\n"
-"partition �r f�r att\n"
-"dual-boota ditt system.\n"
+"Den s�kerhetskopierade partitionstabellen har inte samma storlek.\n"
+"Forts�tta �nd�?"
 
-#: ../../diskdrake.pm_.c:294
-msgid "Please click on a partition"
-msgstr "Var god klicka p� en partition"
+#: ../../diskdrake_interactive.pm_.c:322
+msgid "Warning"
+msgstr "Varning"
 
-#: ../../diskdrake.pm_.c:299
-#, c-format
-msgid "Size: %s\n"
-msgstr "Storlek: %s\n"
+#: ../../diskdrake_interactive.pm_.c:323
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"S�tt in en diskett i diskettstationen.\n"
+"All data p� denna diskett kommer att tas bort."
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometri: %s cylindrar, %s huvuden, %s sektorer\n"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Trying to rescue partition table"
+msgstr "F�rs�ker �terskapa partitionstabellen"
 
-#: ../../diskdrake.pm_.c:302
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-diskar %s\n"
+#: ../../diskdrake_interactive.pm_.c:340
+msgid "Detailed information"
+msgstr "Detaljerad information"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Partitionstabellstyp: %s\n"
+#: ../../diskdrake_interactive.pm_.c:354 ../../diskdrake_interactive.pm_.c:590
+msgid "Resize"
+msgstr "�ndra storlek"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "p� buss %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:355 ../../diskdrake_interactive.pm_.c:630
+msgid "Move"
+msgstr "Flytta"
 
-#: ../../diskdrake.pm_.c:320
-msgid "Mount"
-msgstr "Montera"
+#: ../../diskdrake_interactive.pm_.c:356
+msgid "Format"
+msgstr "Formatera"
 
-#: ../../diskdrake.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:358
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../../diskdrake.pm_.c:324
+#: ../../diskdrake_interactive.pm_.c:359
 msgid "Add to RAID"
 msgstr "Addera till RAID"
 
-#: ../../diskdrake.pm_.c:326
-msgid "Remove from RAID"
-msgstr "Ta bort fr�n RAID"
-
-#: ../../diskdrake.pm_.c:328
-msgid "Modify RAID"
-msgstr "�ndra RAID"
-
-#: ../../diskdrake.pm_.c:330
+#: ../../diskdrake_interactive.pm_.c:360
 msgid "Add to LVM"
 msgstr "Addera till LVM"
 
-#: ../../diskdrake.pm_.c:332
+#: ../../diskdrake_interactive.pm_.c:363
+msgid "Remove from RAID"
+msgstr "Ta bort fr�n RAID"
+
+#: ../../diskdrake_interactive.pm_.c:364
 msgid "Remove from LVM"
 msgstr "Ta bort fr�n LVM"
 
-#: ../../diskdrake.pm_.c:334
+#: ../../diskdrake_interactive.pm_.c:365
+msgid "Modify RAID"
+msgstr "�ndra RAID"
+
+#: ../../diskdrake_interactive.pm_.c:366
 msgid "Use for loopback"
 msgstr "Anv�nd till loopback"
 
-#: ../../diskdrake.pm_.c:341
-msgid "Choose action"
-msgstr "V�lj �tg�rd"
-
-#: ../../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 ""
-"Jag v�grar skapa /boot s� l�ngt in p� disken (p� en cylinder > 1024).\n"
-"Antingen anv�nder du LILO, som inte kommer fungera eller s�\n"
-"anv�nder du inte LILO och d� beh�ver du inte /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 ""
-"Partitionen du har valt att anv�nda som root (/) �r fysiskt placerad efter "
-"den\n"
-"1024:e cylindern p� h�rddisken och du har ingen /bootpartition.\n"
-"Om du t�nkt anv�nda LILO som boothanterare m�ste du l�gga till en /"
-"bootpartition."
-
-#: ../../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 ""
-"Du har valt en mjukvaru-RAID-partition som root (/).\n"
-"Det finns ingen bootladdare som hanterar detta utan en /bootpartition.\n"
-"Se till att skapa en /bootpartition"
+#: ../../diskdrake_interactive.pm_.c:409
+msgid "Create a new partition"
+msgstr "Skapa en ny partition"
 
-#: ../../diskdrake.pm_.c:462 ../../diskdrake.pm_.c:464
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Anv�nd ''%s'' i st�llet"
+#: ../../diskdrake_interactive.pm_.c:412
+msgid "Start sector: "
+msgstr "Startsektor: "
 
-#: ../../diskdrake.pm_.c:468
-msgid "Use ``Unmount'' first"
-msgstr "Anv�nd ''Unmount'' f�rst"
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "Storlek i MB: "
 
-#: ../../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 ""
-"Efter att �ndra partitionstyp %s kommer all data p� denna partition att "
-"f�rsvinna"
+#: ../../diskdrake_interactive.pm_.c:415 ../../diskdrake_interactive.pm_.c:733
+msgid "Filesystem type: "
+msgstr "Typ av filsystem: "
 
-#: ../../diskdrake.pm_.c:481
-msgid "Continue anyway?"
-msgstr "Forts�tta �nd�?"
+#: ../../diskdrake_interactive.pm_.c:416 ../../diskdrake_interactive.pm_.c:936
+#: ../../diskdrake_interactive.pm_.c:1010
+msgid "Mount point: "
+msgstr "Monteringspunkt: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "Avsluta utan att spara"
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "Inst�llning: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "Avsluta utan att skriva partitionstabellen?"
+#: ../../diskdrake_interactive.pm_.c:462
+msgid "Remove the loopback file?"
+msgstr "Ta bort loopback-filen?"
 
-#: ../../diskdrake.pm_.c:516
+#: ../../diskdrake_interactive.pm_.c:486
 msgid "Change partition type"
-msgstr "Byt partitionstyp"
-
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "Vilken filsystem vill du ha?"
+msgstr "�ndra partitionstyp"
 
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Du kan inte anv�nda ReiserFS f�r partitioner minde �n 32MB"
+#: ../../diskdrake_interactive.pm_.c:491
+msgid "Switching from ext2 to ext3"
+msgstr "Byter fr�n ext2 till ext3"
 
-#: ../../diskdrake.pm_.c:537
+#: ../../diskdrake_interactive.pm_.c:521
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Var vill du montera loopback-filen %s?"
 
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Var vill du montera enheten %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"
 msgstr ""
-"Kan inte avaktivera monteringspunkten eftersom denna partition anv�nds\n"
-"f�r loopback. Ta bort loopback f�rst"
+"Kan inte inaktivera monteringspunkten eftersom denna partition\n"
+"anv�nds f�r loopback. Ta bort loopback f�rst."
 
-#: ../../diskdrake.pm_.c:561
-#, c-format
-msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr ""
-"Efter formateringen av partition %s kommer allt data p� partitionen att "
-"f�rsvinna"
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "R�knar ut FAT-filsystemets gr�nser"
 
-#: ../../diskdrake.pm_.c:563
-msgid "Formatting"
-msgstr "Formaterar"
+#: ../../diskdrake_interactive.pm_.c:549 ../../diskdrake_interactive.pm_.c:605
+#: ../../install_interactive.pm_.c:116
+msgid "Resizing"
+msgstr "�ndrar storlek"
 
-#: ../../diskdrake.pm_.c:564
-#, c-format
-msgid "Formatting loopback file %s"
-msgstr "Formaterar looback-filen %s"
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "Denna partition kan inte �ndra storlek"
 
-#: ../../diskdrake.pm_.c:565 ../../install_steps_interactive.pm_.c:430
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formaterar partition %s"
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "All data on this partition should be backed-up"
+msgstr "All data p� den h�r partitionen b�r s�kerhetskopieras."
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "Efter att alla partitioner formaterats,"
+#: ../../diskdrake_interactive.pm_.c:585
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"Efter storleks�ndring av partition %s, kommer all data p� den att vara borta."
 
-#: ../../diskdrake.pm_.c:570
-msgid "all data on these partitions will be lost"
-msgstr "kommer all data p� de valda partitionerna f�rloras"
+#: ../../diskdrake_interactive.pm_.c:590
+msgid "Choose the new size"
+msgstr "V�lj den nya storleken"
 
-#: ../../diskdrake.pm_.c:576
-msgid "Move"
-msgstr "Flytta"
+#: ../../diskdrake_interactive.pm_.c:591
+msgid "New size in MB: "
+msgstr "Ny storlek i MB: "
 
-#: ../../diskdrake.pm_.c:577
+#: ../../diskdrake_interactive.pm_.c:631
 msgid "Which disk do you want to move it to?"
-msgstr "Vilken h�rddisk vill du flytta till?"
+msgstr "Vilken h�rddisk vill du flytta den till?"
 
-#: ../../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 "Vilken sektor vill du flytta till?"
+msgstr "Vilken sektor vill du flytta den till?"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving"
 msgstr "Flyttar"
 
-#: ../../diskdrake.pm_.c:582
+#: ../../diskdrake_interactive.pm_.c:636
 msgid "Moving partition..."
 msgstr "Flyttar partition..."
 
-#: ../../diskdrake.pm_.c:592
+#: ../../diskdrake_interactive.pm_.c:657
+msgid "Choose an existing RAID to add to"
+msgstr "V�lj en existerande RAID att addera till"
+
+#: ../../diskdrake_interactive.pm_.c:658 ../../diskdrake_interactive.pm_.c:676
+msgid "new"
+msgstr "ny"
+
+#: ../../diskdrake_interactive.pm_.c:674
+msgid "Choose an existing LVM to add to"
+msgstr "V�lj en existerande LVM att addera till"
+
+#: ../../diskdrake_interactive.pm_.c:679
+msgid "LVM name?"
+msgstr "LVM-namn?"
+
+#: ../../diskdrake_interactive.pm_.c:718
+msgid "This partition can't be used for loopback"
+msgstr "Denna partition kan inte anv�ndas f�r loopback."
+
+#: ../../diskdrake_interactive.pm_.c:730
+msgid "Loopback"
+msgstr "Loopback"
+
+#: ../../diskdrake_interactive.pm_.c:731
+msgid "Loopback file name: "
+msgstr "Loopback-filnamn: "
+
+#: ../../diskdrake_interactive.pm_.c:736
+msgid "Give a file name"
+msgstr "Ange ett filnamn"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "File already used by another loopback, choose another one"
+msgstr "Filen anv�nds redan av en annan loopback, v�lj en annan."
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "File already exists. Use it?"
+msgstr "Filen finns redan. Anv�nda den?"
+
+#: ../../diskdrake_interactive.pm_.c:784
+msgid "device"
+msgstr "enhet"
+
+#: ../../diskdrake_interactive.pm_.c:785
+msgid "level"
+msgstr "niv�"
+
+#: ../../diskdrake_interactive.pm_.c:786
+msgid "chunk size"
+msgstr "blockstorlek"
+
+#: ../../diskdrake_interactive.pm_.c:801
+msgid "Be careful: this operation is dangerous."
+msgstr "Var f�rsiktig: Detta moment �r farligt."
+
+#: ../../diskdrake_interactive.pm_.c:816
+msgid "What type of partitioning?"
+msgstr "Vilken typ av partitionering?"
+
+#: ../../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 ""
+"Jag v�grar skapa /boot s� l�ngt in p� disken (p� en cylinder > 1024).\n"
+"Antingen anv�nder du LILO, som inte kommer fungera eller s�\n"
+"anv�nder du inte LILO och d� beh�ver du inte /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 ""
+"Partitionen du har valt att anv�nda som root (/) �r fysiskt placerad\n"
+"efter den 1024:e cylindern p� h�rddisken och du har ingen /boot-partition.\n"
+"Om du t�nkt anv�nda LILO som starthanterare m�ste du l�gga till en\n"
+"/boot-partition."
+
+#: ../../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 ""
+"Du har valt en mjukvaru-RAID-partition som root (/).\n"
+"Det finns ingen starthanterare som hanterar detta utan\n"
+"en /boot-partition. Se till att skapa en /boot-partition."
+
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Partitionstabellen p� disk %s kommer att sparas!"
+msgstr "Partitionstabellen p� disk %s kommer att skrivas till disk!"
 
-#: ../../diskdrake.pm_.c:594
+#: ../../diskdrake_interactive.pm_.c:868
 msgid "You'll need to reboot before the modification can take place"
-msgstr "Du beh�ver starta om datorn innan �ndringarna kan aktiveras"
+msgstr "Du beh�ver starta om datorn innan �ndringarna kan verkst�llas."
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "R�knar ut FAT-filsystemets gr�nser"
+#: ../../diskdrake_interactive.pm_.c:879
+#, c-format
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr ""
+"Efter formateringen av partition %s kommer allt data p� partitionen att "
+"f�rsvinna."
 
-#: ../../diskdrake.pm_.c:615 ../../diskdrake.pm_.c:680
-#: ../../install_interactive.pm_.c:107
-msgid "Resizing"
-msgstr "�ndrar storlek"
+#: ../../diskdrake_interactive.pm_.c:881
+msgid "Formatting"
+msgstr "Formaterar"
 
-#: ../../diskdrake.pm_.c:643
-msgid "This partition is not resizeable"
-msgstr "Denna partition kan inte �ndra storlek"
+#: ../../diskdrake_interactive.pm_.c:882
+#, c-format
+msgid "Formatting loopback file %s"
+msgstr "Formaterar loopback-filen %s"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "All data p� den h�r partitionen b�r s�kerhetskopieras"
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formaterar partition %s"
+
+#: ../../diskdrake_interactive.pm_.c:894
+msgid "Hide files"
+msgstr "D�lj filer"
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:894
+msgid "Move files to the new partition"
+msgstr "Flytta filer till den nya partitionen"
+
+#: ../../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 ""
-"Efter storleks�ndring av partition %s, kommer all data p� den att vara borta"
+"Katalogen %s inneh�ller redan data\n"
+"(%s)"
 
-#: ../../diskdrake.pm_.c:660
-msgid "Choose the new size"
-msgstr "V�lj ny storlek"
+#: ../../diskdrake_interactive.pm_.c:906
+msgid "Moving files to the new partition"
+msgstr "Flyttar filerna till den nya partitionen"
 
-#: ../../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 "Kopierar %s"
 
-#: ../../diskdrake.pm_.c:714
-msgid "Create a new partition"
-msgstr "Skapa en ny partition"
+#: ../../diskdrake_interactive.pm_.c:914
+#, c-format
+msgid "Removing %s"
+msgstr "Tar bort %s"
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "Startsektor: "
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "Enhet: "
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "Storlek i MB: "
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS-enhetsbokstav: %s (bara en gissning)\n"
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "Typ av filsystem: "
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "Typ: "
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "Inst�llning: "
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "Namn: "
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "Denna partition kan inte anv�ndas f�r loopback"
+#: ../../diskdrake_interactive.pm_.c:954
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "Start: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Loopback"
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "Storlek: %s"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "Loopback-filnamn: "
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektorer"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "Filen anv�nds redan av en annan loopback, v�lj en annan"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Cylinder %d till cylinder %d\n"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "Filen finns redan. Anv�nda den?"
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "Formaterad\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "V�lj fil"
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "Inte formaterad\n"
+
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "Monterad\n"
+
+#: ../../diskdrake_interactive.pm_.c:963
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:876
+#: ../../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 ""
-"Den s�kerhetskopierade partitionstabellen har inte samma storlek\n"
-"Forts�tta �nd�?"
-
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "Varning"
+"Loopback-fil(er):\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 ""
-"S�tt in en disk i diskettenheten\n"
-"All data p� denna disk kommer att raderas"
+"F�rvald partition f�r uppstart\n"
+"    (f�r MS-DOS-start, inte f�r lilo)\n"
 
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "F�rs�ker �terskapa partitionstabellen"
+#: ../../diskdrake_interactive.pm_.c:968
+#, c-format
+msgid "Level %s\n"
+msgstr "Niv� %s\n"
 
-#: ../../diskdrake.pm_.c:905
-msgid "device"
-msgstr "enhet"
+#: ../../diskdrake_interactive.pm_.c:969
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Blockstorlek %s\n"
 
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "niv�"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-diskar %s\n"
 
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "blockstorlek"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Loopback-filnamn: %s"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "V�lj en existerande RAID att addera till"
+#: ../../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"
+"Chansen finns att denna partition\n"
+"�r en drivrutinspartition, du b�r\n"
+"antagligen l�mna den i fred.\n"
 
-#: ../../diskdrake.pm_.c:920 ../../diskdrake.pm_.c:946
-msgid "new"
-msgstr "ny"
+#: ../../diskdrake_interactive.pm_.c:978
+msgid ""
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
+msgstr ""
+"\n"
+"Denna speciella Bootstrap-\n"
+"partition �r till f�r att\n"
+"kunna starta flera operativsystem p� ditt system.\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "V�lj en existerande LVM att addera till"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "Storlek: %s\n"
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "LVM-namn?"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometri: %s cylindrar, %s huvuden, %s sektorer\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr "Automatisk montering av flyttningsbar media"
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "Information: "
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "R�dda partitionstabell"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-diskar %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Partitionstabellstyp: %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "p� buss %d id %d\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "Ladda om"
+#: ../../diskdrake_interactive.pm_.c:1016
+#, c-format
+msgid "Options: %s"
+msgstr "Alternativ: %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 av %s misslyckades"
 
-#: ../../fs.pm_.c:143
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Jag vet inte hur man formaterar %s i typ %s"
 
-#: ../../fs.pm_.c:230
+#: ../../fs.pm_.c:568
+msgid "mount failed"
+msgstr "montering misslyckades"
+
+#: ../../fs.pm_.c:588
+#, c-format
+msgid "fsck failed with exit code %d or signal %d"
+msgstr "fsck misslyckades, med slutkod %d eller signal %d"
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "montering misslyckades: "
 
-#: ../../fs.pm_.c:242
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "fel vid avmontering %s: %s"
@@ -1819,41 +1977,45 @@ msgstr "enkel"
 msgid "server"
 msgstr "server"
 
+#: ../../fsedit.pm_.c:461
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Du kan inte anv�nda JFS p� partitioner mindre �n 16MB."
+
+#: ../../fsedit.pm_.c:462
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Du kan inte anv�nda ReiserFS p� partitioner mindre �n 32MB."
+
 #
-#: ../../fsedit.pm_.c:262
+#: ../../fsedit.pm_.c:471
 msgid "Mount points must begin with a leading /"
-msgstr "Monteringspunkter m�ste b�rja med /"
+msgstr "Monteringspunkter m�ste b�rja med /."
 
-#: ../../fsedit.pm_.c:265
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Det finns redan en partition med monteringspunkt %s\n"
 
-#: ../../fsedit.pm_.c:273
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Cirkul�ra monteringar %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 "Du kan inte anv�nda en LVM Logical Volume som monteringspunkt %s"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
-msgstr "Denna katalog b�r l�mnas i root-filsystemet"
+msgstr "Denna katalog b�r l�mnas i root-filsystemet."
 
-#: ../../fsedit.pm_.c:287
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
-"Du beh�ver ett riktigt filsystem (ext2, reiserfs) f�r denna monteringspunkt\n"
+"Du beh�ver ett riktigt filsystem (ext2, reiserfs) f�r denna "
+"monteringspunkt.\n"
 
-#: ../../fsedit.pm_.c:369
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Fel vid �ppnande av %s f�r l�sning: %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"
@@ -1862,2061 +2024,1695 @@ msgstr ""
 "nya filsystem kunde hittas. Kontrollera din h�rdvara f�r orsaken till "
 "problemet."
 
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "Du har inga partitioner!"
 
-#: ../../help.pm_.c:9
-msgid ""
-"Please choose your preferred language for installation and system usage."
-msgstr "V�lj �nskat spr�k f�r installationen och systemet."
-
-#: ../../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 ""
-"Du m�ste acceptera villkoren i licensavtalet ovan f�r att forts�tta "
-"installationen.\n"
-"\n"
-"\n"
-"Var god klicka p� \"Accepterar\" om du samtycker med villkoren.\n"
-"\n"
-"\n"
-"Var god klicka p� \"V�grar\" om du misstycker med villkoren. Installationen "
-"avslutas utan att ha modifierat din\n"
-"nuvarande konfiguration."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "V�l den layout som motsvarar ditt tangentbord fr�n lista ovan"
-
-#: ../../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 ""
-"Om du �nskar att andra spr�k (�n det du valde i b�rjan\n"
-"av installationen) ska finnas tillg�ngliga efter installationen,var god\n"
-"v�lj dem i listan ovan. Om du vill ha samtliga, v�lj \"Alla\"."
-
-#: ../../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"
+#: ../../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 ""
+"GNU/Linux �r ett fleranv�ndarsystem, med detta menas att varje anv�ndare\n"
+"kan ha sina egna inst�llningar, sina egna filer och s� vidare. Du kan\n"
+"l�sa i anv�ndarmanualen f�r att l�ra dig mer. Men olikt \"root\", som\n"
+"�r administrat�r, kan anv�ndarna som du l�gger till h�r inte �ndra\n"
+"n�gonting f�rutom sina egna filer och sina egna inst�llningar.\n"
+"Du m�ste skapa �tminstone en vanlig anv�ndare �t dig sj�lv.\n"
+"Det kontot ska du anv�nda i ditt dagliga arbete. Det �r i och f�r\n"
+"sig v�ldigt praktiskt att logga in som \"root\" varje dag men det kan\n"
+"ocks� vara v�ldigt farligt! Det minsta misstag kan inneb�ra att ditt\n"
+"system inte fungerar l�ngre. Om du g�r ett allvarligt misstag som en\n"
+"vanlig anv�ndare f�rlorar du bara viss information och inte hela systemet.\n"
+"\n"
+"F�rst m�ste du ange ditt riktiga namn. Det h�r �r inte obligatoriskt,\n"
+"du kan faktiskt skriva vad du vill. DrakX kommer att ta de f�rsta tv�\n"
+"orden som du skrev in i rutan och flytta �ver de till anv�ndarnamnet.\n"
+"Detta �r namnet som den h�r anv�ndaren kommer att anv�nda f�r att logga\n"
+"in p� systemet. Du kan �ndra det om du vill. Du m�ste sedan ange ett\n"
+"l�senord. En icke-privilegierad (vanlig) anv�ndares l�senord �r inte\n"
+"lika viktigt som \"roots\" sett ur s�kerhetssynpunkt, men det finns\n"
+"ingen anledning att ignorera det, det �r ju trots allt dina filer som\n"
+"st�r p� spel.\n"
+"\n"
+"Efter det att du klickat p� \"Acceptera anv�ndare\" kan du sedan l�gga\n"
+"till s� m�nga som du vill ha. L�gg till en anv�ndare f�r varje kompis som\n"
+"du har: din pappa eller din syster till exempel. N�r du har lagt till alla\n"
+"anv�ndare som du vill ha, v�lj \"Klar\".\n"
+"\n"
+"Om du klickar p� knappen \"Avancerat\" kan du �ndra det f�rvalda \"skalet\"\n"
+"f�r den anv�ndaren (bash �r f�rvalt)."
+
+#: ../../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"
-"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 ""
-"Var god v�lj \"Installera\" om det inte finns n�gon tidigare version av "
-"Linux-Mandrake\n"
-"installerad eller om du �nskar anv�nda flera operativsystem.\n"
+"Listat ovan �r de existerande Linux-partitionerna som hittats p� din\n"
+"h�rddisk. Du kan beh�lla valen som gjorts av guiden, de passar de flesta\n"
+"vanliga installationer. Om du g�r n�gra �ndringar m�ste du �tminstone\n"
+"definiera en root-partition (\"/\"). V�lj inte en f�r liten partition f�r\n"
+"d� kommer du inte kunna installera tillr�ckligt med mjukvara. Om du vill\n"
+"lagra din data p� en separat partition, beh�ver du ocks� skapa en partition\n"
+"f�r /home\n"
+" (endast m�jligt om du har mer �n en Linux-partition tillg�nglig).\n"
 "\n"
+"Varje partition listas som f�ljer: \"Namn\", \"Kapacitet\".\n"
 "\n"
-"Var god v�l \"Uppdatera\" om du �nskar uppdatera en redan befintlig "
-"installation av Linux-Mandrake.\n"
+"\"Namn\" �r strukturerad p� f�ljande vis: \"h�rddisktyp\", \"h�rddisknummer"
+"\",\n"
+"\"partitionsnummer\" (till exempel, \"hda1\").\n"
 "\n"
+"\"H�rddisktyp\" �r \"hd\" om din h�rddisk �r en IDE-h�rddisk och\n"
+"\"sd\" om det �r en SCSI-h�rddisk.\n"
 "\n"
-"Baserat p� din kunskap om GNU/Linux kan du v�lja en av f�ljande niv�er f�r "
-"installation eller uppdatering av\n"
-"ditt Linux-Mandrake-operativsystem:\n"
+"\"H�rddisknummer\" �r alltid en bokstav efter \"hd\" eller \"sd\". F�r IDE-\n"
+"h�rddiskar:\n"
 "\n"
-"\t* Rekommenderad: om du aldrig har installerat ett GNU/Linux operativsystem "
-"v�lj detta. Installationen kommer\n"
-"\t att vara v�ldigt enkel och du f�r bara n�gra f� fr�gor.\n"
+" * \"a\" betyder \"master-h�rddisk p� den prim�ra IDE-kontrollern\",\n"
 "\n"
+" * \"b\" betyder \"slavh�rddisk p� den prim�ra IDE-kontrollern\",\n"
 "\n"
-"\t* Anpassad: om du �r n�gorlunda bekant med GNU/Linux kan du v�lja det "
-"prim�ra �ndam�let (arbetsstation,\n"
-"\t server, utveckling) f�r ditt system. Du f�r besvara fler fr�gor �n i "
-"installationsniv�n \"Rekommenderad\", s� du\n"
-"\t beh�ver veta hur GNU/Linux fungerar f�r att v�lja denna "
-"installationsklass.\n"
+" * \"c\" betyder \"master-h�rddisk p� den sekund�ra IDE-kontrollern\",\n"
 "\n"
+" * \"d\" betyder \"slavh�rddisk p� den sekund�ra IDE-kontrollern\".\n"
 "\n"
-"\t* Expert: om du har god kunskap om GNU/Linux kan du v�lja denna "
-"installationsklass. Som i niv�n \"Anpassad\"\n"
-"\t kommer du att kunna v�lja det prim�ra anv�ndningsomr�det (arbetsstation, "
-"server, utveckling). Var v�ldigt\n"
-"\t f�rsiktig innan du v�ljer denna installationsklass. Du kommer att kunna "
-"utf�ra ett mycket anpassad installation.\n"
-"\t En del fr�gor kan vara v�ldigt sv�ra att besvara om du inte har god "
-"kunskap om GNU/Linux. S�, v�lj inte\n"
-"\t denna installationsklass om du inte �r helt s�ker p� vad du g�r."
+"Med SCSI-h�rddiskar betyder ett \"a\" \"l�gsta SCSI-ID\", ett \"b\" betyder\n"
+"\"andra l�gsta SCSI-ID\", etc."
 
-#: ../../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 ""
-"V�lj:\n"
-"\n"
-"  - Anpassad: Om du �r n�gorlunda bekant med GNU/Linux kan du h�r v�lja\n"
-"    det prim�ra anv�ndningsomr�det f�r din maskin. See nedan f�r detaljer.\n"
-"\n"
-"\n"
-"  - Expert: Det h�r f�ruts�tter att du kan det mesta om GNU/Linux och vill "
-"utf�ra\n"
-"    en mycket anpassad installation. Som under \"Anpassad\" kommer du att\n"
-"    kunna v�lja anv�ndningsomr�de f�r ditt system.\n"
-"    Men sn�lla, sn�lla, V�LJ INTE DETTA OM DU INTE �R S�KER P� VAD DU G�R!"
+"Installationen av Mandrake Linux �r utspridd p� flera CD-skivor. DrakX\n"
+"vet om ett valt paket finns p� en annan CD-skiva och kommer att mata ut\n"
+"den aktuella CD:n och be dig s�tta in en annan om det kr�vs."
 
-#: ../../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"
-"\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"
-"\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 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* 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 ""
-"Nu m�ste du v�lja anv�ndningsomr�de f�r din maskin. Valen �r:\n"
-"\n"
-"\t* Arbetsstation: det ideala valet om du planerar att anv�nda din dator f�r "
-"dagligt arbete, p� jobbet eller\n"
-"\t  hemma.\n"
+" * \"Workstation\": if you plan to use your machine as a workstation, "
+"select\n"
+"one or more of the corresponding groups.\n"
 "\n"
-"\n"
-"\t* Utveckling: om du planerar att anv�nda din dator huvudsakligen f�r "
-"programutveckling �r det h�r ett bra val. Du\n"
-"\t  f�r d� en komplett samling av program installerade �mnade f�r "
-"kompilering, debugging och formatering av k�llkod,\n"
-"\t  eller f�r skapandet av programpaket.\n"
-"\n"
-"\n"
-"\t* Server: om du planerar att anv�nda denna dator som server �r det h�r ett "
-"bra val. Antingen som en filserver (NFS elller\n"
-"\t  SMB), printserver (Unix-modellen eller Microsoft Windows-modellen), "
-"autentisieringsserver (NIS), databasserver, etc.\n"
-"\t  Som s�dan, f�rv�nta dig inte att n�got 'lull-lull' (KDE, GNOME, etc.) "
-"blir installerat."
+" * \"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"
+" * \"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"
+"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 ""
+"Det �r nu dags att specificera vilka program du vill installera p� ditt\n"
+"system. Det finns flera tusen paket tillg�ngliga f�r Mandrake Linux och\n"
+"det �r inte meningen att du ska k�nna till alla.\n"
+"\n"
+"Om du utf�r en standardinstallation fr�n CD-romskivor kommer du f�rst att\n"
+"f� specificera vilka CD-skivor du f�rfogar �ver. Markera rutorna som\n"
+"motsvarar de CD-skivor du har och klicka sedan \"OK\".\n"
+"\n"
+"Paketen �r sorterade guppvis motsvarande vad du har t�nkt anv�nda din\n"
+"maskin till. Grupperna �r sorterade i fyra sektioner:\n"
+"\n"
+" * \"Arbetsstation\": Om du ska anv�nda din maskin som arbetsstation,\n"
+"v�lj en eller flera av de motsvarande grupperna.\n"
+"\n"
+" * \"Grafisk milj�\": H�r v�ljer du den grafiska milj� som du vill anv�nda.\n"
+"V�lj �tminstone en om du vill ha ett grafiskt gr�nssnitt p� din "
+"arbetsstation!\n"
+"\n"
+" * \"Utveckling\": om maskinen ska anv�ndas f�r programmering s� v�lj de\n"
+"�nskade grupperna.\n"
+"\n"
+" * \"Server\": Slutligen, om maskinen ska anv�ndas som server, kan du h�r\n"
+"v�lja de mest vanliga tj�nsterna som du vill ha installerade p� maskinen.\n"
+"\n"
+"Om du flyttar musmark�ren �ver ett gruppnamn f�r du se en kort\n"
+"f�rklaringstext om just den gruppen.\n"
+"\n"
+"Om du klickar p� knappen \"Avancerat\", kan du v�lja enskilda paket.\n"
+"Detta �r anv�ndbart om du vet vilka paket du vill ha installerade eller\n"
+"om du vill ha fullst�ndig kontroll �ver vad som blir installerat.\n"
+"\n"
+"Om du startade installationen i uppdateringsl�ge, kan du avmarkera alla\n"
+"grupper f�r att undvika att installera n�gra nya paket. Detta �r anv�ndbart\n"
+"om du ska laga eller uppdatera ett existerande system."
+
+#: ../../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"
+"!! 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"
+"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 ""
+"Slutligen, beroende p� om du v�ljer att installera enskilda paket eller\n"
+"inte, kommer du att f� se ett tr�d inneh�llande alla paket klassificerade\n"
+"efter grupper och undergrupper. Om du bl�ddrar i tr�det kan du v�lja hela\n"
+"grupper, undergrupper, eller enskilda paket.\n"
+"\n"
+"N�r du v�ljer ett paket i tr�det, visas en beskrivning till h�ger.\n"
+"N�r du har valt klart, klicka p� knappen \"Installera\". D� kommer sj�lva\n"
+"installationen att starta. Beroende p� hastigheten p� din h�rdvara och\n"
+"p� hur m�nga paket som ska installeras kan det h�r processen ta en stund.\n"
+"En uppskattad �terst�ende tid visas p� sk�rmen f�r att visa dig ungef�r hur\n"
+"l�ng tid som �r kvar av installationen, du kanske hinner g� och dricka en\n"
+"kopp kaffe.\n"
+"\n"
+"!! Om det skulle visa sig att ett server-paket har valts antingen\n"
+"oavsiktligt eller om det var med i en hel grupp, kommer du att f� bekr�fta\n"
+"att du verkligen vill att dessa servrar ska installeras. Under Mandrake\n"
+"Linux startas installerade servrar vid uppstart. �ven fast de �r s�kra n�r\n"
+"den h�r distributionen sl�pps, kan det h�nda att s�kerhetsluckor hittats\n"
+"i efterhand. Om du inte vet vad en specifik tj�nst g�r eller varf�r den\n"
+"blir installerad, klicka \"Nej\" h�r. Om du klickar \"Ja\" kommer de "
+"listade\n"
+"tj�nsterna att installeras och startas automatiskt!\n"
+"\n"
+"Alternativet \"Automatiska beroenden\" inaktiverar helt enkelt\n"
+"varningsdialogrutan som visas n�r installationsprogrammet automatiskt\n"
+"v�ljer ett paket. Detta intr�ffar d�rf�r att det har uppt�ckts att ett\n"
+"beroende med ett annat paket m�ste tillfredsst�llas f�r att detta paket\n"
+"ska kunna installeras ordentligt.\n"
+"\n"
+"Den lilla diskettikonen i slutet p� listan l�ter dig ladda en paketlista\n"
+"som du kan ha gjort vid en tidigare installation. N�r du klickar p� den \n"
+"h�r ikonen kommer du att bli ombedd om att stoppa i en diskett som du\n"
+"tidigare kan ha skapat vid slutet av en annan installation. Se det andra\n"
+"tipset i det sista steget hur du g�r f�r att skapa en s�dan diskett."
+
+#: ../../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"
+"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 wish to configure the network later after installation or if you\n"
+"have finished configuring your network connection, click \"Cancel\"."
+msgstr ""
+"Om du vill ansluta din dator till Internet eller till ett lokalt n�tverk,\n"
+"v�lj det korrekta alternativet. Sl� p� din enhet innan du v�ljer det\n"
+"korrekta alternativet s� att DrakX kan hitta den automatiskt.\n"
+"\n"
+"Mandrake Linux l�ter dig konfigurera din Internetanslutning vid\n"
+"installationen. Tillg�ngliga anslutningar �r: traditionellt modem,\n"
+"ISDN-modem, ADSL-anslutning, kabelmodem och slutligen LAN-anslutning\n"
+"(Ethernet).\n"
+"\n"
+"H�r kommer vi inte att g� in p� detaljerna om varje anslutning. Se bara\n"
+"till att du har alla uppgifter fr�n din Internetleverant�r eller\n"
+"systemadministrat�r till hands.\n"
+"\n"
+"Du kan titta i kapitlet som handlar om Internetanslutning i manualen f�r\n"
+"detaljer om de olika inst�llningarana, eller s� kan du helt enkelt v�nta\n"
+"till ditt system �r installerat och anv�nda programmet som beskrivs d�r f�r\n"
+"att st�lla in din anslutning.\n"
+"\n"
+"Om du vill konfigurera n�tverket efter installationen eller om du har\n"
+"konfigurerat klart din n�tverksanslutning, klicka p� \"Avbryt\"."
+
+#: ../../help.pm_.c:172
+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"
+"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 ""
+"V�lj vilka tj�nster du vill starta vid uppstart.\n"
+"\n"
+"H�r visas alla tj�nster tillg�ngliga med den aktuella installationen.\n"
+"Titta igenom dem och avmarkera dem du inte beh�ver vid uppstart.\n"
+"\n"
+"Du kan f� en kort f�rklaringstext om en tj�nst genom att v�lja den\n"
+"specifika tj�nsten. Om du �r os�ker p� om en tj�nst �r anv�ndabar eller\n"
+"inte, l�mna d� den tj�nsten or�rd.\n"
+"\n"
+"Var extra f�rsiktig i dina val om den h�r datorn ska anv�ndas som en\n"
+"server: du vill antagligen inte starta tj�nster som du inte beh�ver.\n"
+"Kom ih�g att flera tj�nster kan inneb�ra en risk om de aktiveras p� en "
+"server.\n"
+"Som generell regel, v�lj bara de tj�nster du verkligen beh�ver."
+
+#: ../../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 hanterar tiden i GMT (Greenwich Manage Time) och �vers�tter den\n"
+"till lokal tid enligt tidszonen du valde."
+
+#: ../../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"
+"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 ""
+"X (f�r X Window System) �r hj�rtat i GNU/Linux grafiska gr�nssnitt\n"
+"p� vilket alla grafiska skrivbordsmilj�er (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) som kommer med Mandrake Linux st�djer sig p�. I den\n"
+"h�r sektionen kommer DrakX att f�rs�ka konfigurera X automatiskt.\n"
+"\n"
+"Det �r v�ldigt s�llsynt att det misslyckas, det kan h�nda om du har\n"
+"v�ldigt gammal h�rdvara (eller v�ldigt ny). Om det lyckas kommer X att\n"
+"startas automatsikt med den b�sta t�nkbara uppl�sningen beroende p�\n"
+"storleken p� din bildsk�rm. Ett f�nster kommer att visas och fr�ga dig\n"
+"om du kan se det.\n"
+"\n"
+"Om du g�r en \"Expert\"-installation kommer du in i konfigurationsguiden\n"
+"f�r X. Se den motsvarande sektionen i manualen f�r mer information\n"
+"om den h�r guiden.\n"
+"\n"
+"Om du kan se meddelandet och svarar \"Ja\", kommer DrakX att forts�tta till\n"
+"n�sta steg. Om du inte kan se meddelandet, betyder det att konfigurationen\n"
+"var fel och testet kommer automatiskt att avslutas efter 10\n"
+"sekunder och sk�rmen �terst�lls."
+
+#: ../../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 ""
+"F�rsta g�ngen du provar X-konfigurationen kanske du inte �r n�jd med\n"
+"bilden (sk�rmen �r f�r liten, f�rskjuten till v�nster eller h�ger...).\n"
+"�ven om X startar korrekt kommer DrakX att fr�ga dig om konfigurationen\n"
+"passar dig. DrakX kommer �ven f�resl� en �ndring av konfigurationen genom\n"
+"att visa en lista p� alla giltiga l�gen som den kunde hitta och be dig "
+"v�lja\n"
+"ett.\n"
+"\n"
+"Som en sista utv�g, om du fortfarande inte kan f� X att fungera, v�lj\n"
+"\"�ndra grafikkort\" och sedan \"Unlisted card\". N�r du f�r fr�gan om\n"
+"vilken server du vill anv�nda, v�lj \"FBDev\". Detta �r ett fels�kert\n"
+"alternativ som fungerar med alla moderna grafikkort. V�lj sedan\n"
+"\"Testa igen\" f�r att vara s�ker p� att det fungerar."
 
-#: ../../help.pm_.c:84
+#: ../../help.pm_.c:224
 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"
-"\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)."
-msgstr ""
-"DrakX kommer att f�rs�ka leta efter PCI SCSI-adaptrar. Om DrakX\n"
-"hittar en SCSI-adapter och k�nner till r�tt drivrutin, kommer den att\n"
-"installeras automatiskt.\n"
-"\n"
-"\n"
-"Om du inte har n�gon SCSI-adapter, ISA SCSI-adapter eller PCI SCSI-adapter,\n"
-"som DrakX inte k�nner igen, kommer du att f� fr�gan om det finns n�gon SCSI-"
-"adapter\n"
-"i ditt system. Om det inte finns n�gon adapter kan du klicka p� \"Nej\". Om "
-"du klickar p�\n"
-"\"Ja\" kommer en lista med drivrutiner att presenteras, fr�n vilken du kan "
-"v�lja din\n"
-"specifika adapter.\n"
-"\n"
-"\n"
-"Om du blir tvungen att manuellt specificera din adapter kommer DrakX att "
-"fr�ga om\n"
-"du vill ange alternativ f�r den. Du b�r till�ta DrakX att sj�lv unders�ka "
-"h�rdvaran efter\n"
-"alternativ. Det fungerar oftast bra.\n"
-"\n"
-"\n"
-"Om inte, kommer du att beh�va ange alternativ f�r drivrutinen. Var god se "
-"'User\n"
-"Guide' (kapitel 3, avsnittet \"Collective informations on your hardware) f�r "
-"tips om hur\n"
-"du f�r tag p� information fr�n h�rdvarudokumentation, tillverkarens hemsida "
-"(om du\n"
-"har tillg�ng till Internet) eller fr�n Microsoft Windows (om du har det p� "
-"ditt system)."
+"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 ""
+"Slutligen kommer du att f� en fr�ga om du vill se det grafiska gr�nssnittet\n"
+"vid uppstart. Observera att du kommer att f� den fr�gan �ven om du valde\n"
+"att inte testa konfigurationen. Du vill nog svara \"Nej\" om maskinen ska\n"
+"anv�ndas som server eller om du inte lyckades f� det grafiska att fungera."
+
+#: ../../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"
+" * 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"
+"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 ""
+"Mandrake Linux CD-romskiva har ett inbyggt s�kerhetsl�ge. Du kan komma �t\n"
+"det genom att starta fr�n CD-skivan och sedan trycka p� >>F1<<-tangenten\n"
+"vid uppstart och skriva >>rescue<< vid prompten. Om din dator inte kan "
+"starta\n"
+"fr�n CD-romskivan b�r du komma tillbaka till det h�r steget i �tminstone "
+"tv�\n"
+"situationer:\n"
+"\n"
+" * n�r starthanteraren installeras kommer DrakX att skriva �ver "
+"startsektorn\n"
+"(MBR) p� din huvuddisk (om du inte anv�nder en annan starthanterare) s� att\n"
+"du kan starta antingen Windows eller GNU/Linux (om du nu har Windows\n"
+"installerat p� din dator). Om du blir tvungen att installera om Windows\n"
+"s� kommer Microsofts installationsprogram att skriva �ver startsektorn\n"
+"vilket leder till att du inte kan starta GNU/Linux!\n"
+"\n"
+" * om ett problem uppst�r s� att du inte kan starta GNU/Linux fr�n\n"
+"h�rddisken kommer den h�r disketten att vara det enda s�ttet att starta\n"
+"GNU/Linux. Den inneh�ller ett antal systemverktyg som kan anv�ndas f�r att\n"
+"�terst�lla ett system som kraschat p� grund av str�mavbrott, en olycklig\n"
+"felstavning, en felskrivning i ett l�senord eller av n�gon annan anledning.\n"
+"\n"
+"N�r du klickar p� det h�r steget kommer du att bli ombedd att stoppa in en\n"
+"diskett i diskettstationen. Disketten som du stoppar in m�ste vara tom "
+"eller\n"
+"inte inneh�lla n�gon data som du vill ha kvar. Du beh�ver inte formatera "
+"den\n"
+"eftersom DrakX kommer att skriva om hela disketten."
 
-#: ../../help.pm_.c:108
+#: ../../help.pm_.c:255
 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"
+"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 "
-"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"
+"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 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 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"
+"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 ""
-"I det h�r l�get beh�ver du v�lja var du vill installera ditt\n"
-"Linux-Mandrake-operativsystem p� din h�rddisk. Om den �r tom eller om ett\n"
-"befintligt operativsystem anv�nder allt tillg�ngligt utrymme beh�ver du\n"
-"partitionera den. Att partitionera en h�rddisk g�r ut p� att man logiskt\n"
-"delar upp den f�r att skapa utrymme f�r ditt nya Linux-Mandrake-system.\n"
-"\n"
+"Nu m�ste du v�lja var du vill installera ditt Mandrake\n"
+"Linux-system p� din h�rddisk. Om den �r tom eller om ett befintligt\n"
+"operativsystem anv�nder allt tillg�ngligt utrymme beh�ver du partitionera\n"
+"den. Att partitionera en h�rddisk g�r ut p� att man logiskt delar upp den\n"
+"f�r att skapa utrymme f�r ditt nya Mandrake Linux-system.\n"
 "\n"
 "Eftersom resultatet av en partitionering vanligtvis inte g�r att �ngra\n"
 "kan partitionering k�nnas skr�mmande om du �r en ovan anv�ndare.\n"
-"Denna guide f�renklar processen. Innan du b�rjar, konsultera manualen\n"
+"Denna guide f�renklar processen. Innan du b�rjar, titta i manualen\n"
 "och ta den tid du beh�ver.\n"
 "\n"
-"\n"
-"Du beh�ver minst tv� partitioner. Den ena �r f�r operativsystemet sj�lvt\n"
-"och den andra f�r det virtuella minnet (s.k. Swap).\n"
-"\n"
+"Om du installerar i Expert-l�get kommer du in i Mandrake Linux\n"
+"partitionsverktyg: Diskdrake. Detta program l�ter dig finjustera dina\n"
+"partitioner. Se kapitlet Diskdrake i manualen. Du kan anv�nda det fr�n\n"
+"installationsgr�nsnittet som det beskrivs h�r genom att klicka p� knappen\n"
+"Guide i dialogrutan.\n"
 "\n"
 "Om partitioner redan �r definierade (fr�n en tidigare installation eller av\n"
 "ett annat partitionsverktyg), beh�ver du bara v�lja dem du vill anv�nda\n"
 "f�r att installera ditt Linux-system.\n"
 "\n"
+"Om partitioner inte redan har definierats, beh�ver du skapa dem.\n"
+"F�r att g�ra det anv�nd guiden tillg�nglig ovan. Beroende p� din\n"
+"h�rddiskkonfiguration, kommer flera l�sningar att finnas tillg�ngliga:\n"
 "\n"
-"Om partitioner inte redan har definierats, beh�ver du skapa dem. \n"
-"F�r att g�ra det, anv�nd guiden tillg�nglig ovan. Beroende p� din h�rddisk-\n"
-"konfiguration, kommer flera l�sningar att finnas tillg�ngliga:\n"
-"\n"
-"\t* Anv�nd existerande partition: guiden har uppt�ckt en eller flera Linux-"
-"partitioner p� din h�rddisk. Om\n"
-"\t  du vill anv�nda dem, v�lj detta alternativ. \n"
+" * \"Anv�nd ledigt utrymme\": det h�r leder till en automatisk\n"
+"partitionering av din tomma disk. Du kommer inte att f� n�gra fler fr�gor.\n"
 "\n"
+" * \"Anv�nd existerande partition\": guiden har hittat en eller flera\n"
+"Linux-partitioner p� din h�rddisk. Om du vill anv�nda dem, v�lj detta\n"
+"alternativ.\n"
 "\n"
-"\t* Rensa hela h�rddisken: Om du vill radera all data p� alla partitioner "
-"som finns p� din h�rddisk och ers�tta\n"
-"\t  dem med ditt nya Linux-Mandrake-system, v�ljer du detta alternativ. Var "
-"f�rsiktig med denna l�sning, du kommer\n"
-"\t  inte att kunna �ngra ditt val efter bekr�ftningen.\n"
+" * \"Anv�nd ledigt utrymme p� Windows-partitionen\": Om Microsoft Windows\n"
+"�r installerat p� din h�rddisk och tar upp allt tillg�ngligt utrymme, m�ste\n"
+"du skapa ledigt utrymme f�r Linux-data. F�r att g�ra det kan du radera din\n"
+"Microsoft Windows-partition och data (se l�sningarna \"Rensa hela\n"
+"h�rddisken\" eller \"Expert-l�ge\") eller �ndra storlek p� din Microsoft\n"
+"Windows-partition.\n"
+"�ndra storlek kan utf�ras utan att f�rlora data. Denna l�sning "
+"rekommenderas\n"
+"om du vill anv�nda b�de Mandrake Linux och Microsoft Windows p� samma "
+"dator.\n"
 "\n"
-"\t* Anv�nd ledigt utrymme p� Windows-partitionen: Om Microsoft Windows �r "
-"installerat p� din h�rddisk och tar\n"
-"\t  upp allt tillg�ngligt utrymme, m�ste du skapa ledigt utrymme f�r Linux-"
-"data. F�r att g�ra det kan du radera din\n"
-"\t  Microsoft Windows-partition och data (se l�sningarna \"Rensa hela "
-"h�rddisken\" eller \"Expert-l�ge\") eller �ndra\n"
-"\t  storlek p� din Microsoft Windows-partition. �ndra storlek kan utf�ras "
-"utan att f�rlora data. Denna l�sning �r\n"
-"\t  rekommenderad om du vill an�vnda b�de Linux-Mandrake och Microsoft "
-"Windows p� samma dator.\n"
+"   Innan du v�ljer denna l�sning m�ste du f�rst� att storleken p� din\n"
+"Microsoft Windows-partition kommer att bli mindre �n den �r f�r n�rvarande.\n"
+"Det betyder att du kommer att ha mindre utrymme under Microsoft Windows f�r\n"
+"att lagra data eller installera ny mjukvara.\n"
 "\n"
+" * \"Rensa hela h�rddisken\": Om du vill ta bort all data och alla\n"
+"partitioner som finns p� din h�rddisk och ers�tta dem med ditt nya\n"
+"Mandrake Linux-system, v�ljer du detta alternativ. Var f�rsiktig med\n"
+"denna l�sning, du kommer inte att kunna �ngra ditt val efter bekr�ftningen.\n"
 "\n"
-"\t  Innan du v�ljer denna l�sning, var god inse att storleken p� din "
-"Microsoft Windows-\n"
-"\t  partition kommer att bli mindre �n den �r f�r n�rvarande. Det betyder "
-"att du kommer att ha mindre utrymme i\n"
-"\t  Microsoft Windows f�r att lagra data eller installera ny mjukvara.\n"
+"   Om du v�ljer detta alternativ kommer all data p� din disk att tas bort!\n"
+" * \"Ta bort Windows\": tar helt enkelt bort allt p� disken och startar en\n"
+"fr�sch partitionering fr�n grunden. All data p� din disk kommer att tas\n"
+"bort.\n"
 "\n"
+"   Om du v�ljer detta alternativ kommer all data p� din disk att tas bort.!\n"
 "\n"
-"\t* Expert-l�ge: om du vill partitionera din h�rddisk manuellt kan du v�lja "
-"detta alternativ. Var f�rsiktig innan\n"
-"\t  du v�ljer denna l�sning. Det �r kraftfullt men det inneb�r en stor risk. "
-"Du kan v�ldigt l�tt f�rlora all din data. S�,\n"
-"\t  v�lj inte denna l�sning om du inte vet vad du g�r."
+" * \"Expert-l�ge\": om du vill partitionera din h�rddisk manuellt kan du\n"
+"v�lja detta alternativ. Var f�rsiktig innan du v�ljer denna l�sning.\n"
+"Detta alternativ �r kraftfullt men det inneb�r samtidigt en stor risk.\n"
+"Du kan v�ldigt l�tt f�rlora all din data.\n"
+"V�lj inte denna l�sning om du inte vet vad du g�r."
 
-#: ../../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"
+"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"
-"   * Undo: you can use this option to cancel your changes.\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"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\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"
-"   * 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"
+"   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"
-"   * 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."
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
 msgstr ""
-"I det h�r l�get beh�ver du v�lja vilka\n"
-"partitioner som ska anv�ndas f�r att installera ditt nya Linux-Mandrake-"
-"system.\n"
-"Om partitioner redan har definierats (av en tidigare GNU/Linux-installation "
-"eller\n"
-"av ett annat partitioneringsverktyg), kan du anv�nda befintliga partitioner. "
-"Annars\n"
-"beh�ver h�rddiskpartitioner definieras.\n"
-"\n"
-"\n"
-"F�r att skapa partitioner m�ste du f�rst v�lja en h�rddisk. Du kan v�lja "
-"vilken\n"
-"disk som ska partitioneras genom att klicka p� \"hda\" f�r f�rsta IDE-"
-"disken, \"hdb\"\n"
-"f�r den andra, eller \"sda\" f�r den f�rsta SCSI-disken, etc.\n"
-"\n"
-"\n"
-"F�r att partitionera den valda h�rddisken kan du anv�nda f�ljande "
-"alternativ:\n"
-"\n"
-"   * Rensa allt: detta alternativ radera alla partitioner som finns p� den "
-"valda h�rddisken.\n"
+"Installationen �r nu f�rdig och ditt GNU/Linux-system �r klart\n"
+"att anv�ndas. Klicka bara p� OK f�r att starta om systemet. Du kan starta\n"
+"GNU/Linux eller Windows, beroende p� vilket du vill anv�nda (om du har\n"
+"dubbla operativsystem), s� fort datorn har startat upp.\n"
 "\n"
+"Knappen \"Avancerat\" visar ytterligare tv� knappar som �r till f�r att:\n"
 "\n"
-"   * Autoallokera: detta alternativ till�ter dig att automatiskt skapa Ext2- "
-"och swap-partitioner i ledigt utrymme\n"
-"     p� din h�rddisk.\n"
+" * Generera en automatisk installationsdiskett: f�r att skapa en\n"
+"installationsdiskett som automatiskt utf�r en hel installation utan\n"
+"hj�lp av en operat�r, likande installationen du just konfigurerade.\n"
 "\n"
+"   Observera att tv� olika alternativ finns tillg�ngliga n�r du klickar p�\n"
+"knappen:\n"
 "\n"
-"   * R�dda partitionstabell: om din partitionstabell �r skadad kan du "
-"f�rs�ka r�dda det med detta alternativ.\n"
-"     Var god var f�rsiktig och kom ih�g att det kan misslyckas.\n"
+"    * \"Repris\". Det h�r �r en delvis automatisk installation eftersom\n"
+"partitioneringssteget (och endast detta) fortfarande �r interaktivt.\n"
 "\n"
+"    * \"Automatisk\". Helt automatisk installation: allt inneh�ll p�\n"
+"h�rddisken skrivs om och all data g�r f�rlorad.\n"
 "\n"
-"   * �ngra: du kan anv�nda detta alternativ f�r att upph�va dina �ndringar.\n"
+"   Den h�r funktionen �r v�ldigt praktisk om du ska installera ett st�rre\n"
+"antal likande datorer. Se sektionen \"Auto install\" p� v�r hemsida.\n"
 "\n"
+" * \"Spara paketval\"(*): sparar f�reg�ende paketval.\n"
+"N�r du sedan g�r en annan installation, s�tt in disketten i "
+"diskettstationen\n"
+"och k�r installationen fram till hj�lpsk�rmen F1, och skriv >>linux defcfg="
+"\"floppy\"<<.\n"
 "\n"
-"   * Ladda om: du kan anv�nda detta alternativ om du vill �ngra alla "
-"�ndringar och ladda din ursprungliga partitionstabell\n"
-"\n"
-"\n"
-"   * Guide: Om du �nskar att anv�nda en guide f�r att partitionera din "
-"h�rddisk kan du v�lja detta alternativ. Det �r\n"
-"     rekommenderat om du inte har s� god kunskap om partitionering.\n"
-"\n"
-"\n"
-"   * �terskapa fr�n floppy: om du har sparat din partitionstabell p� en "
-"floppy under en tidigare installation kan du\n"
-"     �terskapa den genom att anv�nda detta alternativ.\n"
-"\n"
-"\n"
-"   * Spara p� floppy: om du �nskar att spara din partitionstabell p� en "
-"floppy f�r att kunna �terskapa den kan du v�lja\n"
-"     detta alternativ. Det �r starkt rekommenderat att du anv�nder detta "
-"alternativ.\n"
-"\n"
-"   * F�rdig: n�r du har avslutat partitioneringen av din h�rddisk v�ljer du "
-"detta alternativ f�r att spara dina �ndringar.\n"
-"\n"
-"\n"
-"F�r information, du kan n� alla alternativ med hj�lp av tangentbordet: "
-"navigera mellan partitionerna med Tabb och Upp/Ner-pilarna.\n"
-"\n"
-"\n"
-"N�r en partition �r vald kan du anv�nda:\n"
-"           * Ctrl-c f�r att skapa en ny partition (n�r en tom partition �r "
-"vald)\n"
-"\n"
-"           * Ctrl-d f�r att radera en partition\n"
-"\n"
-"           * Ctrl-m f�r att s�tta mount-point\n"
-"           \n"
-"\n"
-"           \n"
-"Om du installerar p� en PPC-maskin kommer du att vilja skapa en liten HFS "
-"'bootstrap'-partition p� minst 1MB f�r\n"
-"bootladdaren yaboot. Om du v�ljer att g�ra partitionen lite st�rre, s�g "
-"50MB, kan du f�rslagsvis utnyttja den f�r att lagra\n"
-"reserv-kernel och ramdisk-image f�r n�dl�gen vid boot."
+"(*) Du beh�ver en FAT-formaterad diskett (f�r att skapa en under GNU/Linux,\n"
+"skriv \"mformat a:\")"
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:350
 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"
+"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"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\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"
-"\"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"
+"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 ""
-"Ovan finns en lista �ver existerande Linux-partitioner uppt�ckta p�\n"
-"din h�rddisk. Du kan beh�lla valen gjorde av guiden, de �r l�mpliga f�r\n"
-"normalt anv�ndande. Om du �ndrar dessa val m�ste du minst definiera\n"
-"en root-partition(\"/\"). V�lj inte en allt f�r liten partition, f�r d� kan "
-"du inte\n"
-"installera tillr�ckligt med mjukvara. Om du vill spara dina data p� en "
-"separat partition,\n"
-"beh�ver du ocks� v�lja en \"/home\" (bara m�jligt om du har mer �n en\n"
-"Linux-partition tillg�nglig).\n"
-"\n"
-"\n"
-"F�r information: varje partition �r listad enligt: \"Namn\", \"Storlek\".\n"
-"\n"
-"\n"
-"\"Namn\" �r uppbyggt enl. f�ljande: \"h�rddisktyp\", \"h�rddisknummer\",\n"
-"\"partitionnummer\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"H�rddisktyp\" �r \"hd\" om din h�rddisk �r en IDE-disk och \"sd\"\n"
-"om det �r en SCSI-disk.\n"
-"\n"
-"\n"
-"\"H�rddisknummer\" �r alltid en bokstav efter \"hd\" eller \"sd\". Men IDE-"
-"diskar:\n"
+"Alla partitioner som har blivit definierade m�ste formateras innan\n"
+"anv�ndning (formatering betyder skapa filsystem).\n"
 "\n"
-"   * \"a\" betyder \"master p� prim�ra IDE-kontrollern\",\n"
+"I det h�r l�get kanske du vill omformatera n�gra redan existerande\n"
+"partitioner f�r att rensa dem p� data. Om du vill g�ra det, v�lj de\n"
+"partitioner du vill formatera.\n"
 "\n"
-"   * \"b\" betyder \"slave p� prim�ra IDE-kontrollern\",\n"
+"Observera att det inte �r n�dv�ndigt att omformatera alla existerande\n"
+"partitioner. Du m�ste omformatera de partitioner som inneh�ller sj�lva\n"
+"operativsystemet. (som t ex \"/\", \"/usr\" eller \"/var\") men du beh�ver\n"
+"inte formatera partitioner som inneh�ller data du vill beh�lla\n"
+"(vanligtvis /home).\n"
 "\n"
-"   * \"c\" betyder \"master p� sekund�ra IDE-kontrollern\",\n"
+"Var f�rsiktig n�r du v�ljer partitioner, f�r efter formatering kommer all\n"
+"data att vara raderat och du kommer inte att kunna �terskapa n�gonting.\n"
 "\n"
-"   * \"d\" betyder \"slave p� sekund�ra IDE-kontrollern\".\n"
+"Klicka p� \"OK\" n�r du �r redo att formatera partitionerna.\n"
 "\n"
+"Klicka p� \"Avbryt\" om du vill v�lja andra partitioner att installera ditt\n"
+"nya Mandrake Linux-system p�.\n"
 "\n"
-"Med SCSI-diskar: ett \"a\" betyder \"prim�r h�rddisk\", ett \"b\" betyder "
-"\"sekund�r h�rddisk\", etc..."
+"Klicka p� \"Avancerat\" f�r att v�lja p� vilka partitioner du vill leta\n"
+"efter felaktiga block."
 
-#: ../../help.pm_.c:258
+#: ../../help.pm_.c:376
 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 ""
-"V�lj vilken h�rddisk du vill rensa f�r att installera din\n"
-"nya Linux-Mandrake-partition. Var f�rsiktig, all data som existerar p� den\n"
-"kommer att f�rsvinna och inte g� att �terskapa."
+"Ditt nya operativsystem Mandrake Linux h�ller p� att installeras.\n"
+"Beroende p� hur m�nga paket som ska installeras och p� din dators\n"
+"hastighet, kan detta moment ta n�gra minuter eller betydligt l�ngre tid.\n"
+"\n"
+"Var god v�nta."
 
-#: ../../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"
-"\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
+"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 ""
-"Klicka p� \"OK\" om du vill radera all data och alla\n"
-"partitioner som existerar p� denna h�rddisk. Var f�rsiktig, efter att du "
-"klickat \"OK\"\n"
-"kommer du inte att kunna �terskapa data och partitioner som finns p� "
-"h�rddisken,\n"
-"inklusive ev. Windows-data.\n"
-"\n"
-"\n"
-"Klicka p� \"Avbryt\" f�r att avbryta denna operation utan att f�rlora data "
-"och partitioner\n"
-"p� den aktuella h�rddisken."
+"Innan du forts�tter b�r du noga l�sa licensen. Den t�cker hela\n"
+"Mandrake Linux-distributionen och om du inte samtycker med den,\n"
+"klicka p� knappen \"V�grar\" som omedelbart avbryter installationen.\n"
+"F�r att forts�tta installationen klicka p� knappen \"Acceptera\"."
 
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:391
 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, 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, 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:\")."
+"If you do not know what to choose, keep the default option."
 msgstr ""
-"Mer �n en Microsoft Windows-partition har uppt�ckts p� din\n"
-"h�rddisk. Var god v�lj den som du vill �ndra storlek p� f�r att installera\n"
-"ditt nya Linux-Mandrake-operativsystem.\n"
-"\n"
-"\n"
-"F�r information: varje partition �r listad som f�ljer: \"Linux-namn\", "
-"\"Windows-\n"
-"namn\" \"Storlek\".\n"
-"\n"
-"\"Linux-namn\" �r uppbyggt enl. f�ljande: \"h�rddisktyp\", \"h�rddisknummer"
-"\",\n"
-"\"partitionnummer\" (t.ex. \"hda1\").\n"
-"\n"
-"\n"
-"\"H�rddisktyp\" �r \"hd\" om din h�rddisk �r en IDE-disk och \"sd\"\n"
-"om det �r en SCSI-disk.\n"
-"\n"
-"\n"
-"\"H�rddisknummer\" �r alltid en bokstav efter \"hd\" eller \"sd\". Med IDE-"
-"diskar:\n"
-"\n"
-"   * \"a\" betyder \"master p� den prim�rara IDE-kontrollern\",\n"
-"\n"
-"   * \"b\" betyder \"slave p� den prim�ra IDE-kontrollern\",\n"
+"Nu �r det dags att v�lja vilken s�kerhetsniv� som ska till�mpas p�\n"
+"datorn. En tumregel �r att ju mer tillg�nglig en dator �r och ju viktigare\n"
+"dess data �r, desto h�gre b�r s�kerhetsniv�n vara.\n"
+"Det b�r dock n�mnas att niv�n p� s�kerheten p�verkar hur l�ttanv�nd\n"
+"datorn blir. Se MSEC-kapitlet i \"Reference Manual\" f�r mer information\n"
+"om de olika s�kerhetsniv�erna.\n"
 "\n"
-"   * \"c\" betyder \"master p� den sekund�ra IDE-kontrollern\",\n"
-"\n"
-"   * \"d\" betyder \"slave p� den sekund�ra IDE-kontrollern\".\n"
-"\n"
-"Med SCSI-diskar, ett \"a\" betyder \"prim�r h�rddisk\", ett \"b\" betyder "
-"\"sekund�r h�rddisk\", etc. \n"
-"\n"
-"\n"
-"\"Windows-namn\" �r enhetsbokstaven p� din h�rddisk i Windows (den f�rsta "
-"disken\n"
-"eller partitionen kallas \"C:\")."
+"Om du inte �r s�ker p� vad du ska v�lja, beh�ll det f�rvalda v�rdet."
 
-#: ../../help.pm_.c:306
-msgid "Please be patient. This operation can take several minutes."
-msgstr "Var god v�nta. Detta moment kan ta flera minuter."
-
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:401
 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"
+"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"
-"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"
+"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"
-"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"
+" * \"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"
-"Click on \"OK\" when you are ready to format partitions.\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"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
-msgstr ""
-"Alla partitioner som har blivit definierade m�ste\n"
-"formateras innan anv�ndning (formatering betyder skapa filsystem).\n"
-"\n"
-"\n"
-"I det h�r l�get kanske du �nskar omformatera n�gra redan existerande "
-"partitioner\n"
-"f�r att rensa dem p� data. Om du �nskar g�ra s� var god v�lj de partitioner "
-"du\n"
-"vill formatera.\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"
-"Notera att det inte �r n�dv�ndigt att omformatera alla existerande "
-"partitioner.\n"
-"Du m�ste formatera om de partitioner som inneh�ller sj�lva "
-"operativsystemet.\n"
-"(som t.ex. \"/\", \"/usr\" och \"/var\") men du beh�ver inte formatera "
-"partitioner\n"
-"som inneh�ller data som du �nskar beh�lla (vanligtvis /home).\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"
-"Var f�rsiktig n�r du v�ljer partitioner, f�r efter formatering kommer all "
-"data att\n"
-"vara raderat och du kommer inte att kunna �terskapa n�gonting.\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"
-"Klicka p� \"OK\" n�r du �r redo att formatera partitionerna.\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"
-"Klicka p� \"Avbryt\" om du vill v�lja andra partitioner att installera ditt "
-"nya\n"
-"Linux-Mandrake-system p�."
-
-#: ../../help.pm_.c:335
-msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
+" * Ctrl-m to set the mount point.\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..."
+"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 ""
-"H�r kan du v�lja vilka grupper av paket du vill installera eller "
-"uppgradera.\n"
-"\n"
+"Nu m�ste du v�lja vilka partitioner som ska anv�ndas f�r installationen av\n"
+"ditt Mandrake Linux-system. Om partitioner redan har definierats, antingen\n"
+"fr�n en tidigare installation av GNU/Linux eller av ett annat\n"
+"partitionsverktyg, kan du anv�nda dessa. Om partitioner inte redan har\n"
+"definierats, m�ste du skapa dem.\n"
 "\n"
-"DrakX kommer sedan att kontrollera att du har tillr�ckligt med utrymme f�r "
-"att\n"
-"installera dem. Om inte, f�r du en varning om detta. Om du �nd� vill "
-"forts�tta\n"
-"den valda installationen kommer den att g� vidare men hoppar �ver mindre\n"
-"viktiga paket. L�ngst ner i listan kan du v�lja alternativet \"V�lj enskilda "
-"paket\"\n"
-"och f�r i s� fall lov att bl�ddra bland fler �n 1000 paket..."
-
-#: ../../help.pm_.c:347
-msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\n"
+"F�r att skapa partitioner m�ste du f�rst v�lja en h�rddisk. Du kan v�lja\n"
+"disken som ska partitioneras genom att klicka p� \"hda\" f�r den f�rsta\n"
+"IDE-disken, \"hdb\" f�r den andra, \"sda\" f�r den f�rsta SCSI-disken\n"
+"och s� vidare.\n"
 "\n"
+"F�r att partitionera den valda disken kan du anv�nda dessa alternativ:\n"
 "\n"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\n"
+" * \"Nollst�ll\": det h�r alternativet tar bort alla partitioner p�\n"
+"den valda h�rddisken.\n"
 "\n"
+" * \"Allokera automatiskt\": det h�r alternativet l�ter dig automatiskt\n"
+"skapa Ext2- och v�xlingspartitioner p� det lediga utrymmet p� h�rddisken.\n"
 "\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
+" * \"R�dda partitionstabell\": om din partitionstabell �r f�rst�rd kan du\n"
+"f�rs�ka �terst�lla den genom att anv�nda det h�r alternativet.\n"
+"Var f�rsiktig och kom ih�g att det kan misslyckas.\n"
 "\n"
+" * \"�ngra\": anv�nd detta alternativ f�r att hoppa �ver dina �ndringar\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 ""
-"Nu kan du v�lja de enskilda paket som du �nskar\n"
-"installera.\n"
+" * \"Ladda om\": du kan anv�nda detta alternativ f�r att �ngra alla\n"
+"�ndringar och ladda din initiala partitionstabell.\n"
 "\n"
+" * \"Guide\": anv�nd det h�r alternativet om du vill anv�nda en guide f�r\n"
+"att partitionera din h�rddisk. Det h�r alternativet rekommenderas om du\n"
+"inte har god kunskap om partitionering.\n"
 "\n"
-"Du kan expandera eller komprimera tr�det genom att klicka p� alternativet i "
-"paket-\n"
-"f�nstrets v�nstra h�rn.\n"
+"* \"�terst�ll fr�n diskett\": det h�r alternativet l�ter dig �terst�lla en\n"
+"sparad partitionstabell fr�n diskett.\n"
 "\n"
+" * \"Spara till diskett\": sparar partitionstabellen till en diskett.\n"
+"Anv�ndbart om du senare beh�ver �terst�lla partitionstabellen. Du\n"
+"rekommenderas att utf�ra detta steg.\n"
 "\n"
-"Om du f�redrar att se paketen sorterade i alfabetisk ordning klicka p� "
-"ikonen\n"
-"\"Byt mellan rak och gruppvis sortering\".\n"
+" * \"F�rdig\": n�r du har partitionerat klart din h�rddisk, kommer detta\n"
+"att spara �ndringarna till disk.\n"
 "\n"
+"Observera: du kan hoppa till vilket alternativ som helst med tangentbordet.\n"
+"Navigera genom partitionerna med tangenten tabb och upp- och nerpilarna.\n"
 "\n"
-"Om du inte vill bli varnad f�r beroenden ('dependencies') klicka p� "
-"\"Automatiska\n"
-"beroenden\". Om du g�r detta, notera att avmarkering av ett paket kan "
-"medf�ra\n"
-"tyst avmarkering av flera andra paket som �r beroende av det."
-
-#: ../../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 ""
-"Om du har alla CD-skivor i listan ovan, klicka Ok. Om du inte\n"
-"har n�gon alls av dem, klicka Avbryt. Om du saknar vissa, v�lj bort\n"
-"dem och klicka sedan 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"
+"N�r en partition �r vald kan du anv�nda:\n"
 "\n"
+" * Ctrl-c f�r att skapa en ny partition (n�r en tom partition har valts);\n"
 "\n"
-"Please be patient."
-msgstr ""
-"Ditt nya Linux-Mandrake operativsystem h�ller p� att installeras.\n"
-"Detta moment b�r ta n�gra minuter (beroende p� storleken av din\n"
-"installation och p� din dators hastighet).\n"
+" * Ctrl-d f�r att ta bort en partition;\n"
 "\n"
+" * Ctrl-m f�r att ange monteringspunkten.\n"
 "\n"
-"Var god v�nta."
-
-#: ../../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 ""
-"Du kan nu testa din mus. Anv�nd knappar och hjul f�r att verifiera\n"
-"att inst�llningarna �r bra. Om inte, kan du klicka p� \"Avbryt\" f�r att\n"
-"v�lja en annan drivrutin."
-
-#: ../../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 ""
-"Var god v�lj r�tt port. Som hj�lp kan n�mnas att COM1-porten\n"
-"i Windows heter ttyS0 i GNU/Linux"
+"Om du installerar p� en PPC-maskin, vill du nog skapa en en liten HFS-\n"
+"partition (\"bootstrap\") p� �tminstone 1 MB. Den kommer att anv�ndas av\n"
+"starthanteraren Yaboot. Om du g�r partitionen lite st�rre, s�g 50 MB,\n"
+"kan du anv�nda en del f�r att lagra en reservk�rna och en ramdisk.\n"
+"Detta �r anv�ndbart om det skulle uppst� en n�dsituation som g�r att\n"
+"du inte kan starta med den vanliga k�rnan."
 
-#: ../../help.pm_.c:386
+#: ../../help.pm_.c:460
 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"
+"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"
-"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 ""
-"Om du �nskar att koppla din dator mot Internet eller\n"
-"till ett lokalt n�tverk v�lj motsvarande alternativ. Var god sl� p� din "
-"utrustning\n"
-"innan du v�ljer r�tt alternativ s� DrakX kan detektera det automatiskt.\n"
-"\n"
-"\n"
-"Om du inte har n�gon koppling mot Internet eller lokalt n�tverk, v�lj\n"
-"\"Inaktivera n�tverk\".\n"
-"\n"
+"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"Om du �nskar att konfigurera n�tverket senare efter installationen, eller om "
-"du har\n"
-"slutf�rt din n�tverkskonfiguration, v�lj \"F�rdig\"."
-
-#: ../../help.pm_.c:399
-msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\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"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-"Inget modem har uppt�ckts. Var god v�lj vilken serieport modemet sitter i.\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"
-"F�r information, den f�rsta serieporten (kallad \"COM1\" i Microsoft\n"
-"Windows) kallas \"ttyS0\" i 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 ""
-"Nu kan du ange egenskaperna f�r uppringningen. Om du inte vet\n"
-"eller �r s�ker p� vad du ska skriva, kan du f�r korrekt information av\n"
-"din Internetleverant�r. Om du inte anger n�gon DNS (namnserver)\n"
-"h�r, kommer den informationen att h�mtas fr�n din Internetleverant�r\n"
-"n�r du kopplar upp."
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-"Om ditt modem �r externt, var god ha det p�slaget s� DrakX kan detektera det "
-"automatiskt."
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr "Var god ha ditt modem p�slaget och v�lj motsvarande."
-
-#: ../../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 ""
-"Om du inte �r s�ker p� om informationen ovan �r\n"
-"korrekt, eller om du inte �r s�ker p� vad du ska ange, kan du f� den "
-"korrekta\n"
-"informationen av din Internetleverant�r. Om du inte anger n�gon DNS\n"
-"(namnserver) h�r, kommer den informationen att h�mtas automatiskt fr�n din\n"
-"Internetleverant�r n�r du kopplar upp."
-
-#: ../../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 ""
-"Du kan nu skriva in ditt v�rdnamn, om s� beh�vs. Om du\n"
-"inte vet eller inte �r s�ker p� vad du ska skriva kan du f� korrekt\n"
-"information av din Internetleverant�r."
-
-#: ../../help.pm_.c:431
-msgid ""
-"You may now configure your network device.\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\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"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\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"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc.\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."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
-"Du kan nu konfigurera din n�tverksenhet.\n"
-"\n"
-"   * IP-adress: Om du inte vet eller inte �r s�ker p� vad du ska skriva, "
-"fr�ga din n�tverksadministrat�r.\n"
-"     Du ska inte ange n�gon IP-adress om du v�ljer alternativet \"Automatisk "
-"IP\" nedan.\n"
+"Fler �n en Microsoft Windows-partition har hittats p� din h�rddisk.\n"
+"V�lj vilken av dem du vill �ndra storlek p� f�r att kunna installera ditt\n"
+"nya operativsystem Mandrake Linux.\n"
 "\n"
-"   * N�tmask: \"255.255.255.0\" �r vanligtvis ett bra val. Om du inte vet "
-"eller inte �r s�ker p� vad du ska\n"
-"     skriva, fr�ga din n�tverksadministrat�r.\n"
+"Varje partition listas som f�ljer: \"Linux-namn\", \"Windows-namn\"\n"
+"\"Kapacitet\".\n"
 "\n"
-"   * Automatisk IP: om ditt n�tverk anv�nder BOOTP eller DHCP, v�lj detta "
-"alternativ. Om valt, beh�vs det\n"
-"     inte n�got v�rde under \"IP-adress\". Om du inte vet eller inte �r "
-"s�ker, fr�ga din n�tverksadministrat�r."
-
-#: ../../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 ""
-"Du kan nu ange ditt v�rdnamn, om s� beh�vs. Om du\n"
-"inte vet eller inte s�ker p� vad du ska skriva, fr�ga din "
-"n�tverksadministrat�r."
-
-#: ../../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 ""
-"Du kan nu ange ditt v�rdnamn, om det beh�vs. Om du\n"
-"inte vet eller inte �r s�ker vad du ska ange, l�mna tomt."
-
-#: ../../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 ""
-"H�r kan du ange egenskaper f�r din anslutning. Om du �r os�ker om vad\n"
-"du skall ange s� kan du f� den korrekta informationen fr�n din 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 ""
-"Om du vill anv�nda proxy, var god konfigurera dem nu. Om du inte vet "
-"huruvida\n"
-"du ska anv�nda proxy, fr�ga din n�tverksadministrat�r eller din "
-"Internetleverant�r."
-
-#: ../../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"
+"\"Linux-namn\" �r strukturerad p� f�ljande vis: \"h�rddisktyp\", "
+"\"h�rddisknummer\",\n"
+"\"partitionsnummer\" (till exempel, \"hda1\").\n"
 "\n"
+"\"H�rddisktyp\" �r \"hd\" om din h�rddisk �r en IDE-h�rddisk och\n"
+"\"sd\" om det �r en SCSI-h�rddisk.\n"
 "\n"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"Om din Internetanslutning �r konfigurerad kan du installera paket f�r\n"
-"kryptering. F�rst m�ste du v�lja varifr�n du vill ladda ner paketen.\n"
-"D�refter kan du v�lja vilka paket du vill installera.\n"
+"\"H�rddisknummer\" �r alltid en bokstav efter \"hd\" eller \"sd\". Med IDE-\n"
+"h�rddiskar:\n"
 "\n"
+" * \"a\" betyder \"master-h�rddisk p� den prim�ra IDE-kontrollern\",\n"
 "\n"
-"Observera att du m�ste v�lja plats och paket f�r kryptering enligt\n"
-"g�llande lagstiftning d�r du �r."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr "Du kan nu v�lja den tidszon du befinner dig i."
-
-#: ../../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"
+" * \"b\" betyder \"slavh�rddisk p� den prim�ra IDE-kontrollern\",\n"
 "\n"
+" * \"c\" betyder \"master-h�rddisk p� den sekund�ra IDE-kontrollern\",\n"
 "\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"GNU/Linux hanterar tid i GMT (Greenwich Mean Time) and\n"
-"och �vers�tter det till lokal tid enligt den tidszon du har valt.\n"
+" * \"d\" betyder \"slavh�rddisk p� den sekund�ra IDE-kontrollern\".\n"
 "\n"
+"Med SCSI-h�rddiskar, betyder \"a\" \"l�gsta SCSI-ID\", ett \"b\" betyder\n"
+"\"andra l�gsta SCSI-ID\", etc.\n"
 "\n"
-"Om du �ven anv�nder Microsoft Windows p� den h�r datorn v�lj \"Nej\"."
+"\"Windows-namn\" �r bokstaven p� din h�rddisk under Windows (den f�rsta\n"
+"disken eller partitionen kallas \"C:\")."
 
-#: ../../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"
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
+msgstr "Var god v�nta. Den h�r operationen kan ta flera minuter."
+
+#: ../../help.pm_.c:494
+msgid ""
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). 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 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"
+" * 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 ""
+"Drakx vill nu veta om du vill utf�ra en standardinstallation\n"
+"(\"Rekommenderad\") eller om du vill ha st�rre kontroll �ver\n"
+"vad som blir installerat (\"Expert\".\n"
+"Du kan ocks� v�lja om du vill g�ra en ny installation eller uppdatera ett\n"
+"befintligt Mandrake Linux-system. Om du klickar p� \"Installera\" kommer\n"
+"det gamla systemet att helt tas bort. V�lj \"Uppdatera\" om du vill\n"
+"uppdatera eller laga ett befintligt system.\n"
 "\n"
+"V�lj \"Installera\" om det inte finns n�gon tidigare version av Mandrake\n"
+"Linux installerad eller om du �nskar anv�nda flera operativsystem.\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 ""
-"Var god v�lj vilka tj�nster du vill skall startas vid boot.\n"
+"V�lj \"Uppdatera\" om du �nskar uppdatera eller laga en redan befintlig\n"
+"installation av Mandrake Linux.\n"
 "\n"
+"Baserat p� din kunskap om GNU/Linux kan du v�lja en av f�ljande niv�er f�r\n"
+"installation eller uppdatering av ditt Mandrake Linux-operativsystem:\n"
 "\n"
-"N�r du flyttar muspekaren �ver ett tj�nstalternativ, poppar det upp en "
-"liten\n"
-"hj�lpbubbla som beskriver tj�nstens funktion.\n"
+" * Rekommenderad: om du aldrig har installerat ett GNU/Linux operativsystem\n"
+"v�lj detta. Installationen kommer att vara v�ldigt enkel och du f�r bara\n"
+"n�gra f� fr�gor.\n"
 "\n"
-"Var extra f�rsiktig i dina val om den h�r datorn skall anv�ndas som en "
-"server:\n"
-"du vill antagligen inte starta tj�nster du inte beh�ver. Var god kom ih�g\n"
-"att flera tj�nster kan inneb�ra en risk om de aktiveras p� en server.\n"
-"Som generell regel, v�lj bara tj�nster som du verkligen beh�ver."
-
-#: ../../help.pm_.c:492
+" * Expert: om du har god kunskap om GNU/Linux kan du v�lja denna\n"
+"installationsklass. Expert-installationen l�ter dig utf�ra en mycket\n"
+"anpassad installation. En del fr�gor kan vara v�ldigt sv�ra att besvara om\n"
+"du inte har god kunskap om GNU/Linux. V�lj inte denna installationsklass\n"
+"om du inte �r helt s�ker p� vad du g�r."
+
+#: ../../help.pm_.c:521
+msgid ""
+"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 ""
+"I de flesta fall v�ljer DrakX r�tt tangentbord �t dig (beroende p� vilket\n"
+"spr�k du har valt) och det hela sker automatiskt. Men det kan h�nda\n"
+"att du har ett tangentbord som inte helt motsvarar ditt spr�k: om du\n"
+"till exempel �r en engelsktalande schweizare kanske du �nd� vill att\n"
+"ditt tangentbord �r schweiziskt. Eller om du talar engelska och bor i\n"
+"Quebec kan du befinna dig i en liknande situation. I b�da fallen beh�ver\n"
+"du g� tillbaka till detta installationssteg och v�lja �nskat tangentbord\n"
+"ur listan.\n"
+"\n"
+"Klicka p� knappen \"Mer\" f�r en komplett lista �ver tillg�ngliga\n"
+"tangentbord."
+
+#: ../../help.pm_.c:534
+msgid ""
+"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 ""
+"V�lj det spr�k du �nskar anv�nda f�r installation och systemanv�ndning.\n"
+"\n"
+"Om du klickar p� knappen \"Avancerat\" kan du v�lja andra spr�k som du vill\n"
+"ha installerade p� din arbetsstation. Genom att v�lja andra spr�k s� kommer\n"
+"spr�kspecifika filer f�r systemdokumentation och program att installeras.\n"
+"Om du till exempel f�r bes�k av personer fr�n Spanien som beh�ver anv�nda\n"
+"din dator, v�lj Engelska som huvudspr�ket i tr�dvyn, och under den "
+"avancerade\n"
+"sektionen, klicka p� den gr�a stj�rnan som motsvarar \"Spanska|Spanien\".\n"
+"\n"
+"Observera att flera spr�k kan installeras. S� fort du har valt alla\n"
+"ytterligare spr�k, klicka p� knappen \"OK\" f�r att forts�tta."
+
+#: ../../help.pm_.c:547
+msgid ""
+"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"
+"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 ""
+"Som standard antar DrakX att du har mus med tv� knappar och kommer att\n"
+"st�lla in den f�r knapp 3-emulering. DrakX kommer automatiskt att veta\n"
+"om musen �r av typ PS/2, seriell eller USB.\n"
+"\n"
+"Om du vill specificera en annan mustyp v�lj d� den i listan\n"
+"som visas.\n"
+"\n"
+"Om du v�ljer en annan mus �n den f�rvalda kommer en testsk�rm att\n"
+"visas. Anv�nd musknapparna och hjulet f�r att verifiera att inst�llningarna\n"
+"�r korrekt. Om musen inte fungerar ordentligt tryck p� mellanslag eller\n"
+"Enter f�r att avbryta och v�lja igen."
+
+#: ../../help.pm_.c:560
 msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
 msgstr ""
-"Du kan konfigurera en lokal skrivare (kopplad till din dator) eller "
-"n�tverks-\n"
-"skrivare (via ett Unix-, Netware- eller Microsoft Windows-n�tverk)."
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\n"
+"V�lj den korrekta porten. COM1-porten under MS Windows\n"
+"har namnet ttyS0 under GNU/Linux."
+
+#: ../../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"
-"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"
+"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"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\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"
-"If you don't have printer, click on \"None\"."
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Om du �nskar att kunna skriva ut, v�lj mellan de b�da utskriftssystemen\n"
-"CUPS och LPR.\n"
+"Det h�r �r det viktigaste steget f�r s�kerheten i ditt GNU/Linux-system:\n"
+"du ska ange \"root\"-l�senordet. \"root\" �r systemets administrat�r och\n"
+"den enda som har r�ttigheter att g�ra uppdateringar, l�gga till anv�ndare,\n"
+"�ndra p� systemets �vergripande konfiguration, osv. Kort sagt, \"root\" kan\n"
+"g�ra allt! D�rf�r m�ste du v�lja ett l�senord som �r sv�rt att lista ut - \n"
+"DrakX talar om f�r dig om du v�ljer ett l�senord som �r f�r l�tt. Som du\n"
+"ser har du m�jlighet att inte ange n�got l�senord alls, men vi avr�der fr�n\n"
+"det, om bara f�r att �ven om du k�r GNU/Linux kan du ha andra "
+"operativsystem\n"
+"som beg�r misstag. Eftersom \"root\" kan g� f�rbi alla begr�nsningar och\n"
+"oavsiktligt radera all data p� partitioner, kan de manipulera med\n"
+"partitionerna sj�lva p� ett of�rsiktigt s�tt, d�rf�r �r det viktigt att\n"
+"det �r sv�rt att bli \"root\".\n"
 "\n"
+"L�senordet ska vara en blandning av numeriska tecken och bokst�ver och\n"
+"minst �tta tecken l�ngt. Skriv aldrig ner \"root\"-l�senordet - det\n"
+"�kar risken f�r ett intr�ng i systemet.\n"
 "\n"
-"CUPS �r ett nytt, kraftfullt och flexibelt utskriftssystem f�r Unix-system "
-"(CUPS\n"
-"betyder \"Common Unix Printing System\"). Det �r standardutskriftssystemet "
-"i\n"
-"Linux-Mandrake.\n"
+"G�r dock inte l�senordet f�r l�ngt och komplicerat, f�r du m�ste\n"
+"kunna komma ih�g det utan allt f�r mycket besv�r.\n"
 "\n"
+"L�senordet visas inte p� sk�rmen n�r du skriver in det. Det �r d�rf�r\n"
+"du f�r skriva det tv� g�nger, f�r att undvika att du skriver fel. Om du\n"
+"g�r samma skrivfel tv� g�nger beh�ver du anv�nda detta \"felaktiga\"\n"
+"l�senord f�rsta g�ngen du loggar in.\n"
 "\n"
-"LPR �r det gamla utskriftssystemet, anv�nt i �ldre versioner av Linux-"
-"Mandrake.\n"
+"I expertl�get f�r du fr�gan om du vill ansluta mot en autentiseringsserver,\n"
+"exempelvis NIS eller LDAP.\n"
 "\n"
+"Om ditt n�tverk anv�nder LDAP (eller NIS) f�r autentisering, v�lj\n"
+"\"LDAP\" (eller \"NIS\") som autentisering. Om du �r os�ker, fr�ga\n"
+"din n�tverksadministrat�r.\n"
 "\n"
-"Om du inte har n�gon skrivare, klicka p� \"Ingen\"."
+"Om din dator inte �r ansluten till n�got administrerat n�tverk uppmanas du\n"
+"att v�lja \"Lokala filer\" som autentisering."
 
-#: ../../help.pm_.c:511
+#: ../../help.pm_.c:600
 msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\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"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\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"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\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"
-"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 kan hantera m�nga olika typer av skrivare. Varje s�dan skrivare "
-"kr�ver\n"
-"olika inst�llningar.\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"
-"Om din skrivare �r fysiskt kopplad till din dator, v�lj \"Lokal\n"
-"skrivare\".\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"
-"Om du vill n� en skrivare som finns p� en annan Unix-dator, v�lj\n"
-"\"N�tverksskrivare\".\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"
-"Om du vill n� en skrivare som finns p� en Microsoft Windows-dator\n"
-"(eller Unix-dator som anv�nder SMB), v�lj \"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"
+"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"
-"   * 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 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 ""
-"Var god ha din skrivare p�slagen innan DrakX f�rs�ker detektera den.\n"
-"\n"
-"Du m�ste ange en del information h�r.\n"
+"LILO och GRUB �r starthanterare f�r GNU/Linux. Det h�r steget �r\n"
+"vanligtvis helt automatiskt. DrakX analyserar startsektorn p�\n"
+"disken och upptr�der lite olika beroende p� vad den hittar d�r:\n"
 "\n"
+" * om en Windows-startsektor hittas, kommer den att ers�ttas med en GRUB/"
+"LILO-\n"
+"startsektor. Du kommer att kunna ladda antingen GNU/Linux eller ett annat "
+"OS;\n"
 "\n"
-"   * Skrivarens namn: print-spoolern anv�nder \"lp\" som standard "
-"skrivarnamn. S�, du m�ste ha en skrivare som heter \"lp\".\n"
-"     Om du bara har en skrivare kan du anv�nda flera olika namn f�r den. Du "
-"beh�ver bara separera dem med ett pipe-\n"
-"     tecken (ett \"|\"). S�, om du f�redrar att ha ett mer meningsfullt namn "
-"beh�ver du s�tta det f�rst, t.ex. \"Min skrivare|lp\".\n"
-"     Skrivaren som har \"lp\" i sitt namn blir standardskrivare.\n"
-"\n"
-"\n"
-"   * Beskrivning: det h�r �r valfritt men kan vara anv�ndbart om du har "
-"flera skrivare kopplad till din dator eller om du till�ter\n"
-"     andra datorer n� denna skrivare.\n"
-"\n"
-"\n"
-"   * Plats: om du vill ange information om var din skrivare\n"
-"     �r placerad, g�r det h�r (du kan ange vad du vill, \n"
-"     t.ex. \"Andra v�ningen\").\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"
+" * om en GRUB- eller LILO-startsektor hittas, kommer den att ers�ttas med "
+"en\n"
+"ny;\n"
 "\n"
+"Vid tveksamheter kommer DrakX att visa en dialogruta med diverse "
+"alternativ.\n"
 "\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
-msgstr ""
-"Du beh�ver ange en del information h�r.\n"
+" * \"Starthanterare som ska anv�ndas\": du har tre val:\n"
 "\n"
+"    * \"LILO med grafisk meny\": om du f�redrar LILO med grafiskt\n"
+"gr�nssnitt.\n"
 "\n"
-"   * K�namnet: print-spoolern anv�nder \"lp\" som standard skrivarnamn. S�, "
-"du beh�ver ha en skrivare som heter \"lp\".\n"
-"     Om du bara har en skrivare kan du anv�nda flera namn f�r den. Du "
-"beh�ver bara separera dem med ett pipe-\n"
-"     tecken (ett \"|\"). S�, om du f�redrar att ha ett mer meningsfullt namn "
-"beh�ver du s�tta det f�rst, t.ex. \"Min skrivare|lp\".\n"
-"     Skrivaren som har \"lp\" i sitt namn blir standardskrivare.\n"
+"    * \"GRUB\": om du f�redrar GRUB (textbaserad meny).\n"
 "\n"
-"  \n"
-"   * Spool-katalog: det �r i denna katalog som skrivarjobben lagras. Anv�nd "
-"f�rinst�llt val\n"
-"     om du inte vet vad du ska anv�nda\n"
+"    * \"LILO med textbaserad meny\": om du f�redrar LILO med textbaserad "
+"meny.\n"
 "\n"
+" * \"Startenhet\": i de flesta fall beh�ver du inte �ndra det f�rvalda "
+"v�rdet\n"
+"(\"/dev/hda\"), men om du f�redrar s� kan starthanteraren installeras p� "
+"den\n"
+"andra h�rddisken (\"/dev/hdb\"), eller till och med p� en diskett (\"/dev/fd0"
+"\").\n"
 "\n"
-"   * Skrivarkoppling: Om din skrivare �r fysiskt kopplad till din dator v�lj "
-"\"Lokal skrivare\".\n"
-"     Om du vill n� en skrivare som sitter p� en annan Unix-dator v�lj "
-"\"N�tverksskrivare\".\n"
+" * \"F�rdr�jning innan f�rvald avbild startar\": vid omstart av datorn �r "
+"detta\n"
+"tiden som anv�ndaren har p� sig att v�lja ett annat v�rde �n det f�rvalda\n"
+"i starthanterarens meny.\n"
 "\n"
+"!! Om du v�ljer att inte installera en starthanterare (genom att v�lja\n"
+"\"Avbryt\"), m�ste du se till att du har ett annat s�tt att starta ditt "
+"Mandrake\n"
+"Linux-system! Var ocks� s�ker p� att du vet vad du g�r innan du �ndrar\n"
+"n�gra av alternativen!\n"
 "\n"
-"     Om du vill n� en skrivare som sitter p� en Microsoft Windows-dator "
-"(eller en Unix-dator som anv�nder SMB)\n"
-"     v�lj \"SMB/Windows 95/98/NT\".\n"
+"Om du klickar p� knappen \"Avancerat\" i den h�r dialogrutan kommer du att\n"
+"erbjudas m�nga avancerade alternativ som �r reserverade f�r "
+"expertanv�ndaren.\n"
 "\n"
+"Mandrake Linux installerar sin egen starthanterare, vilken l�ter dig starta\n"
+"antingen GNU/Linux eller n�got annat operativsystem som du kan ha "
+"installerat p�\n"
+"din dator.\n"
 "\n"
-"     Om du vill n� en skrivare som sitter p� ett NetWare-n�tverk, v�lj "
-"\"NetWare\".\n"
+"Om det finns n�got annat operativsystem installerat p� din dator kommer det\n"
+"att automatiskt l�ggas till startmenyn. H�r kan du v�lja att finjustera\n"
+"de existerande alternativen. Om du dubbelklickar p� en existerade post kan "
+"du\n"
+"�ndra dess parametrar eller helt ta bort den; \"L�gg till\" skapar en ny "
+"post;\n"
+"och \"F�rdig\" forts�tter till n�sta installationssteg."
 
-#: ../../help.pm_.c:573
+#: ../../help.pm_.c:647
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\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"
-"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."
+"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 ""
-"Din skrivare kunde inte detekteras. Var god ange namnet p� den enhet\n"
-"den �r kopplad till.\n"
-"\n"
+"LILO (LInux LOader) och GRUB �r starthanterare: de kan starta\n"
+"antingen GNU/Linux eller n�got annat operativsystem installerat\n"
+"p� din dator. Vanligtvis s� hittas och installeras dessa andra\n"
+"operativsystem automatiskt. Om s� inte �r fallet kan du l�gga till\n"
+"en post manuellt i den h�r sk�rmen. Var f�rsiktig s� att du inte\n"
+"v�ljer fel parametrar.\n"
 "\n"
-"F�r information, de flesta skrivare �r kopplade till den f�rsta "
-"parallellporten. Den\n"
-"kallas \"/dev/lp0\" i GNU/Linux och \"LPT1\" i Microsoft Windows."
+"Du kanske inte vill att n�gon annan ska f� �tkomst till dessa andra\n"
+"operativsystem. Om s� �r fallet kan du ta bort de motsvarande posterna.\n"
+"Men om du g�r det, m�ste du anv�nda en startdiskett f�r att kunna starta\n"
+"dessa andra operativsystem!"
 
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr "Du m�ste nu v�lja din skrivare i listan ovan."
-
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:658
 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"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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."
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
 msgstr ""
-"Var god v�lj de korrekta alternativen g�llande din skrivare.\n"
-"Se skrivaren dokumentation om du inte vet vad du ska skriva h�r.\n"
-"\n"
+"Du m�ste indikera var du vill placera informationen som kr�vs f�r att\n"
+"starta GNU/Linux.\n"
 "\n"
-"Du kommer att kunna testa din konfiguration i n�sta steg och �ven modifiera "
-"den om det inte fungerar som du vill."
+"Om du inte vet exakt vad du g�r, v�lj \"F�rsta sektorn p� enheten\n"
+"(MBR)\"."
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:665
 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"
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\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"
+" * \"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"
+"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"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
+"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 ""
-"Var god ange ett l�senord f�r root-anv�ndaren p� ditt\n"
-"Linux-Mandrake-system. L�senordet m�ste anges tv� g�nger\n"
-"f�r att du skall vara s�ker p� att du skrivit r�tt.\n"
-"\n"
-"\n"
-"Root-anv�ndaren �r administrat�ren f�r systemet, och �r den enda\n"
-"anv�ndare som kan modifiera systemkonfigurationen. D�rf�r b�r du\n"
-"v�lja detta l�senord noggrant! �tkomst till root-kontot av en\n"
-"obeh�rig kan vara extremt farligt f�r integriteten hos systemet,\n"
-"dess data och andra system anslutna till det.\n"
+"DrakX letar nu efter IDE-enheter i din dator. DrakX kommer ocks� att\n"
+"leta efter PCI SCSI-kort p� ditt system. Om DrakX hittar ett SCSI-kort\n"
+"och k�nner till r�tt drivrutin, kommer kortet att installeras automatiskt.\n"
 "\n"
-"L�senordet b�r vara en blandning av alfanumeriska tecken och minst 8\n"
-"tecken l�ngt. Det b�r aldrig skrivas ner.\n"
+"Om du har n�got SCSI-kort som DrakX inte hittar, kommer du i alla fall att\n"
+"f� fr�gan om det finns n�got PCI SCSI-kort i ditt system. Om det inte finns\n"
+"n�got kort kan du klicka p� \"Nej\". Om du klickar \"Ja\" kommer en lista\n"
+"med kort att presenteras, fr�n vilken du kan v�lja ditt specifika kort.\n"
+"Om du �r os�ker kan du markera \"Visa h�rdvaruinformation\" och klicka\n"
+"\"OK\" s� visas en lista �ver vilken h�rdvara som hittats i din maskin.\n"
+"Unders�k listan med h�rdvara och klicka sedan p� knappen \"OK\" f�r att\n"
+"�terg� till SCSI-gr�nssnittsfr�gan.\n"
 "\n"
+"Om du blir tvungen att manuellt specificera ditt kort kommer DrakX att\n"
+"fr�ga om du vill ange alternativ f�r det. Du b�r till�ta DrakX att sj�lv\n"
+"unders�ka h�rdvaran efter alternativ. Detta fungerar oftast bra.\n"
 "\n"
-"Dock b�r du inte v�lja ett f�r l�ngt eller komplicerat l�senord: du m�ste "
-"sj�lv\n"
-"kunna komma ih�g det utan allt f�r stor anstr�ngning."
+"Om inte, kommer du att beh�va ange alternativ f�r drivrutinen. Se \"User\n"
+"Guide\" (kapitel 3, avsnittet \"Collective informations on your hardware\")\n"
+"f�r tips om hur du f�r tag p� information fr�n h�rdvarudokumentation,\n"
+"tillverkarens hemsida (om du har tillg�ng till Internet) eller fr�n\n"
+"Microsoft Windows (om du har det p� ditt system)."
 
-#: ../../help.pm_.c:609
+#: ../../help.pm_.c:720
 msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"F�r att g�ra ditt system s�krare, b�r du v�lja \"Anv�nd shadowfil\" samt\n"
-"\"Anv�nd MD5-l�senord\"."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
-msgstr ""
-"Om ditt n�tverk anv�nder NIS, v�lj \"Anv�nd NIS\". Om du inte vet, fr�ga "
-"din\n"
-"n�tverksadministrat�r."
-
-#: ../../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"
+"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"
-"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"
+"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"
-"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 ""
-"Du kan nu skapa ett eller flera \"vanliga\" anv�ndarkonton (till skillnad\n"
-"fr�n det \"privilegierade\" anv�ndarkontot, root). Du kan skapa ett eller\n"
-"flera konton f�r varje person som du vill ska kunna anv�nda datorn.\n"
-"Observera att varje anv�ndarkonto har sina egna inst�llningar (grafiskt\n"
-"utseende, spr�k, menyalternativ, etc), och sitt eget \"hembibliotek\",\n"
-"d�r alla dessa inst�llningar, samt anv�ndarens egna dokument, sparas.\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"
-"Allra f�rst b�r du skapa ett konto �t dig sj�lv! �ven om du kommer att\n"
-"vara den enda anv�ndaren p� datorn, b�r du absolut inte anv�nda root-kontot\n"
-"f�r vanligt arbete: att g�ra s� �r en mycket stor s�kerhetsrisk. En "
-"felskrivning\n"
-"kan g�ra systemet oanv�ndbart.\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"
-"D�rf�r b�r du logga in p� datorn som den anv�ndare du skapar h�r och endast\n"
-"logga in som root f�r att administrera och underh�lla systemet."
-
-#: ../../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 ""
-"Att skapa en startdiskett �r starkt rekommenderat. Om du inte\n"
-"kan starta din dator �r en s�dan det enda som kan r�dda ditt system utan\n"
-"en ominstallation."
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/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"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"Var god ange var du vill placera informationen som\n"
-"Linux beh�ver f�r att boota.\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"
-"Om du inte vet exakt vad du ska g�ra, v�lj \"F�rsta sektorn p�\n"
-"disken (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 ""
-"Utom om du vet att s� inte �r fallet, s� skall du v�lja \"/dev/hda\"\n"
-" (prim�r, master IDE-disk) eller \"/dev/sda\" (F�rsta SCSI-disken)."
-
-#: ../../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"
+" * 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"
-"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: 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 ""
-"LILO (LInux LOader) och Grub �r s.k. bootladdare: de kan ladda Linux\n"
-"eller n�got annat operativsystem installerat p� din dator. Oftast\n"
-"detekteras dessa andra operativsystem automatiskt. Om detta inte �r\n"
-"fallet, kan du l�gga till dem f�r hand h�r. Var noggran med att ange\n"
-"korrekt parametrar f�r de olika operativsystemen.\n"
-"\n"
-"\n"
-"Om det �r s� att du inte vill l�ta n�gon anv�nda dessa andra\n"
-"operativsystem, kan du ta bort dem fr�n listan. Men i s� fall m�ste\n"
-"du ha en bootdiskett f�r de aktuella operativsysten f�r att kunna\n"
-"starta dem!"
-
-#: ../../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"
+"Du kan l�gga till ytterligare alternativ f�r yaboot, antingen f�r andra\n"
+"operativsystem, alternativa k�rnor, eller startavbildning f�r\n"
+"n�dsituationer.\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"
+"F�r andra operativsystem best�r alternativet bara av en etikett\n"
+"och root-partitionen.\n"
 "\n"
+"F�r Linux finns det n�gra olika alternativ:\n"
 "\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
+" * Label: helt enkelt namnet som du beh�ver skriva vid yaboot-prompten\n"
+"f�r att v�lja detta startalternativ.\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
+" * Image: namnet p� k�rnan du vill starta. Vanligtvis vmlinux\n"
+"eller en variationen p� vmlinux med ett till�gg.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
+" * Root: \"root\"-enheten eller \"/\" f�r din Linux-installation.\n"
 "\n"
+"* Append: med Apple-h�rdvara anv�nds till�ggsalternativet f�r k�rnan ganska\n"
+"ofta f�r att initialisera videoh�rdvara, eller f�r att aktivera "
+"musemulering\n"
+"med tangentbordet eftersom andra och tredje musknappen ofta saknas p� en\n"
+"standardmus fr�n Apple. N�gra exempel:\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:s och grubs huvudalternativ �r:\n"
-"  - Bootenhet: Anger namnet p� enheten (t.ex. en h�rddiskpartition)\n"
-"som inneh�ller bootsektorn. Om du inte har anledning att tro n�gonting\n"
-"annat, v�lj \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - F�rdr�jning innan standard-image startar: Specificerar i tiondelar av\n"
-"en sekund hur l�nge bootladdaren ska v�nta innan den startar f�rsta\n"
-"imagen. Det �r anv�ndbart p� system som startar fr�n h�rddisken direkt\n"
-"efter tangentbordet �r aktiverat. Bootladdaren v�ntar inte om \"f�rdr�jning"
-"\" �r\n"
-"utel�mnat eller satt till noll.\n"
-"\n"
-" - Videol�ge: Detta anger vilket VGA-textl�ge som ska anv�ndas vid\n"
-"uppstart. F�ljande v�rden �r tillg�ngliga: \n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
+"hda=autotune\n"
 "\n"
-"    * normal: anv�nd normalt 80x25-textl�ge.\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"    * <nummer>: anv�nd motsvarande textl�ge.\n"
+" * Initrd: detta alternativ kan anv�ndas antingen f�r att ladda moduler,\n"
+"innan startenheten �r tillg�nglig, eller f�r att ladda en ramdiskavbildning\n"
+"vid krissituationer.\n"
 "\n"
+" * Initrd-size: standardstorleken p� ramdisken �r vanligtvis 4096 byte.\n"
+"Om du beh�ver allokera en st�rre ramdisk, anv�nd detta alternativ.\n"
 "\n"
-"  - Rensa \"/tmp\" vid varje uppstart: om du vill radera alla filer och "
-"kataloger\n"
-"som finns i \"/tmp\" n�r du startar ditt system, v�lj detta alternativ.\n"
+" * Read-write: vanligtvis startar \"root\"-partitionen i skrivskyddat l�ge\n"
+"f�r att till�ta en filsystemskontroll innan systemet startar p� \"riktigt"
+"\".\n"
+"H�r kan du g� f�rbi denna funktion.\n"
 "\n"
+" * NoVideo: skulle Apple-videoh�rdvaran vara extra kr�nglig kan du v�lja\n"
+"detta \"novideo\"-l�ge, med framebuffer-st�d.\n"
 "\n"
-"  - Ange RAM-storlek, om det beh�vs: olyckligt nog finns det inget "
-"standards�tt att fr�ga\n"
-"BIOS om hur mycket RAM som finns i din dator. Som en f�ljd av detta kan "
-"Linux\n"
-"misslyckas detektera din RAM-storlek korrekt. Om s� �r fallet kan du\n"
-"specificera den r�tta RAM-storleken h�r. Var god notera att en skillnad\n"
-"p� 2 eller 4 MB mellan detekterat minne och faktiskt minne �r helt normalt."
+" * Default: vad som ska vara Linux standardalternativ, det som v�ljs bara\n"
+"genom att trycka Enter vid yabootprompten. Det blir ocks� markerat med en\n"
+"\"*\" om du trycker [Tabb] f�r att se startalternativen."
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:765
 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 ""
-"Yaboot �r en bootladdare f�r NewWorld MacIntosh-h�rdvara. Den kan\n"
-"boota antingen GNU/Linux, MacOS eller MacOSX, om tillg�ngligt p� din dator.\n"
-"Normalt �r dessa andra operativsystem korrekt detekterade och installerade.\n"
-"Om s� inte �r fallet kan du l�gga till ett alternativ f�r hand i denna "
-"ruta.\n"
-"Var noga med att du v�ljer r�tt parametrar.\n"
-"\n"
+"Yaboot �r en starthanterare f�r NewWorld MacIntosh-h�rdvara. Den kan ladda\n"
+"antingen GNU/Linux, MacOS eller MacOSX. I de flesta fall blir dessa "
+"operativ-\n"
+"system korrekt identifierade och installerade. Om s� inte �r fallet kan du\n"
+"l�gga till dem manuellt h�r. Var f�rsiktig s� du v�ljer r�tt parametrar.\n"
 "\n"
 "Yaboots huvudalternativ �r:\n"
 "\n"
+" * Init Message: ett enkelt textmeddelande som visas f�re startprompten.\n"
 "\n"
-"  - Init Message: ett simpelt textmeddelande som visas f�re boot-\n"
-"prompten.\n"
-"\n"
-"\n"
-"  - Boot Device: Anger var du vill placera informationen som beh�vs f�r att\n"
-"starta GNU/Linux. Vanligtvis beh�ver du ha satt upp en bootstrap-partition\n"
-"tidigare f�r att h�lla denna information.\n"
-"\n"
-"\n"
-"  - Open Firmware-f�rdr�jning: Till skillnad fr�n LILO finns tv� olika "
-"f�rdr�jningar\n"
-"tillg�ngliga med yaboot. Den f�rsta f�rdr�jningen m�ts i sekunder och d� "
-"kan\n"
-"du v�lja mellan CD, OK boot, MacOS eller Linux.\n"
-"\n"
-"\n"
-"  - Kernel Boot Timeout: Denna timeout liknad LILOs f�rdr�jning. Efter att\n"
-"valt Linux kommer du att ha denna f�rdr�jning i 0.1 sekunder innan din "
-"standard-\n"
-"kernel-beskrivning �r vald.\n"
-"\n"
+" * Boot Device: indikerar var du vill placera informationen som beh�vs\n"
+"f�r att starta GNU/Linux. Vanligtvis s�tter man upp en \"bootstrap\"-\n"
+"partition tidigare f�r att lagra denna information.\n"
 "\n"
-"  - Aktivera CD-Boot?: Att kryssa f�r detta alternativ l�ter dig v�lja 'C' "
-"f�r CD vid\n"
-"f�rsta bootprompten.\n"
+" * Open Firmware Delay: till skillnad fr�n LILO finns det tv� f�rdr�jningar\n"
+"i yaboot. F�rsta f�rdr�jningen r�knas i sekunder och vid detta tillf�lle\n"
+"kan du v�lja mellan CD, OF-start, MacOS eller Linux.\n"
 "\n"
+" * Kernel Boot Timeout: denna tidsgr�ns motsvarar f�rdr�jningen i LILO.\n"
+"Efter att du valt Linux kommer en f�rdr�jning p� 0.1 sekunder innan din\n"
+"f�rvalda k�rna v�ljs.\n"
 "\n"
-"  - Aktivera OF-Boot?: Att kryssa f�r detta alternativ l�ter dig v�lja 'N' "
-"f�r Open\n"
-"Firmware vid f�rsta bootprompten.\n"
+" * Enable CD Boot?: genom att v�lja detta alternativ kan du v�lja \"C\" f�r\n"
+"CD vid f�rsta startprompten.\n"
 "\n"
+" * Enable OF Boot?: genom att v�lja detta alternativ kan du v�lja \"N\" f�r\n"
+"\"Open Firmware\" vid f�rsta startprompten.\n"
 "\n"
-"  - Default OS: Du kan v�lja vilket OS som startar som standard n�r tiden "
-"g�tt ut\n"
-"f�r Open Firmwares f�rdr�jning."
+"* Default OS: du kan v�lja vilket OS som ska starta som standard n�r\n"
+"\"Open Firmware\"-f�rdr�jningen �r �ver."
 
-#: ../../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"
+"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"
-"For other OS's - the entry consists only of a label and the root partition.\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"
-"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"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\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"
+" * \"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: 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."
+" * \"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 ""
-"Du kan l�gga till ytterligare alternativ f�r yaboot, antingen f�r andra "
-"operativsystem,\n"
-"en annan kernel eller f�r en boot-image f�r n�dfall.\n"
-"\n"
-"\n"
-"F�r andra OS:s - posten best�r bara av en label och rotpartitionen.\n"
-"\n"
-"\n"
-"F�r Linux finns det n�gra olika alternativ: \n"
-"\n"
-"\n"
-"  - Label: Det �r helt enkelt namnet att skriva vid boot f�r att v�lja "
-"detta\n"
-"startalternativ.\n"
-"\n"
-"\n"
-"  - Image: Den h�r �r namnet p� den kernel som ska boota. Vanligtvis vmlinux "
-"eller\n"
-"en variant p� vmlinux med ett till�gg.\n"
-"\n"
-"\n"
-"   - Root: Enheten f�r root eller '/' f�r din Linux-installation.\n"
-"\n"
-"\n"
-"  \n"
-"  - Append: I Apple-h�rdvara anv�nd kernels till�gg ganska ofta f�r att\n"
-"assistera vid initialiseringen av videoh�rdvara eller f�r att aktivera "
-"tangentbordsemulation\n"
-"av musknapp 2 och 3 som ofta saknas p� standard Apple-m�ss. F�ljande\n"
-"�r n�gra exempel:\n"
-"\n"
-"\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
+"H�r presenteras olika parametrar r�rande din maskin. Beroende p�\n"
+"installerad h�rdvara ser du alla eller n�gra av f�ljande alternativ:\n"
 "\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
+" * \"Mus\": kontrollera din muskonfiguration och om n�dv�ndigt klicka\n"
+"p� knappen f�r att �ndra.\n"
 "\n"
+" * \"Tangentbord\": kontrollera din tangentbordsupps�ttning och om\n"
+"n�dv�ndigt klicka p� knappen f�r att �ndra.\n"
 "\n"
-" \n"
-"  - Initrd: Detta alternativ kan anv�ndas antingen f�r att ladda initiala "
-"moduler, innan boot-\n"
-"enheten finns tillg�nglig eller f�r att ladda en ramdisk-image f�r problem "
-"vid boot.\n"
+" * \"Tidszon\": zoneDrakX antar vilken tidszon du har, utifr�n det\n"
+"spr�k du har valt. Men h�r g�ller samma sak som vid val av tangentbord,\n"
+"du kanske inte befinner dig i det land som motsvarar det spr�k du har valt.\n"
+"D�rf�r kan du beh�va klicka p� knappen \"Tidszon\" f�r att konfigurera\n"
+"klockan efter din tidszon.\n"
 "\n"
+" * \"Skrivare\": om du klickar p� \"Ingen skrivare\" startar skrivarguiden.\n"
 "\n"
-"  - Initrd:size: Standard ramdisk-storlek �r vanligtvis 4096 byte. Om du "
-"skulle beh�va\n"
-"allokera en stor ramdisk detta alternativ kan anv�ndas.\n"
+" * \"Ljudkort\": om ett ljudkort uppt�cks i din dator visas det h�r.\n"
+"Ingen �ndring �r m�jlig under installationen.\n"
 "\n"
+" * \"TV-kort\": om ett TV-kort uppt�cks i din dator visas det h�r.\n"
+"Ingen �ndring �r m�jlig under installationen.\n"
 "\n"
-"  - Read-write: Vanligtvis �r rotpartitionen laddad som read-only, f�r att "
-"till�ta ett\n"
-"filsystem testas innan systemet k�r ig�ng. Du kan f�rbig� det h�r.\n"
-"\n"
-"\n"
-"  - NoVideo: Skulle videoh�rdvaran fr�n Apple orsaka extra mycket trubbel "
-"kan du\n"
-"v�lja detta alternativ f�r att starta i 'novideo'-l�ge, med framebuffer-"
-"st�d.\n"
-"\n"
-"\n"
-"  - Standard: V�ljer detta alternativ som standard Linux-val, valbart bara "
-"genom att\n"
-"trycka Enter vid yaboot-prompten. Detta alternativ blir ocks� markerat med "
-"en '*', om du\n"
-"trycker Tabb f�r att se startalternativen."
+" * \"ISDN-kort\": om ett ISDN-kort uppt�cks i din dator visas det h�r.\n"
+"Du kan klicka p� knappen f�r att �ndra dess parametrar."
 
-#: ../../help.pm_.c:793
+#: ../../help.pm_.c:827
 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!"
+"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 ""
-"SILO �r en bootladdare f�r SPARC: den kan starta\n"
-"antingen GNU/Linux eller annat operativsystem som finns p� din dator.\n"
-"Oftast �r dessa andra operativsystem automatiskt detekterade och\n"
-"installerade. Om s� inte �r fallet kan du l�gga till dem f�r hand h�r.\n"
-"Var f�rsiktig s� du v�ljer r�tt parametrar.\n"
-"\n"
-"\n"
-"Kanske vill du att ingen annan ska f� tillg�ng till dessa operativsystem,\n"
-"i s� fall kan du radera dem ur listan. Men d� kommer du att beh�va\n"
-"en startdiskett f�r att starta dem!"
+"V�lj vilken h�rddisk du vill radera f�r att kunna installera din nya\n"
+"Mandrake Linux-partition. Var f�rsiktig, all data som f�r tillf�llet\n"
+"finns p� disken kommer att g� f�rlorad och kommer inte att kunna �terst�llas!"
 
-#: ../../help.pm_.c:805
+#: ../../help.pm_.c:832
 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 ""
-"Huvudalternativen f�r SILO �r:\n"
-"  - Bootladdarinstallation: Anger var du vill lagra informationen som\n"
-"    beh�vs f�r att starta GNU/Linux. Om du inte vet exakt vad du vill\n"
-"    g�ra, v�lj \"F�rsta sektorn p� disken (MBR)\".\n"
-"\n"
-"\n"
-"  - F�rdr�jning innan standard-image startar: Anger hur l�nge LILO eller "
-"Grub\n"
-"    skall v�nta innan den automatiskt v�ljer standardalternativet. Tiden\n"
-"    anges i tiondelar av en sekund. Om du inte anger n�gon tid, eller anger "
-"0,\n"
-"    kommer standardalternativet att v�ljas omedelbart."
-
-#: ../../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"
+"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"
-"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 ""
-"Det �r nu dags att att konfigurera X-Windowssystemet, vilket �r k�rnan i\n"
-"Linux grafiska gr�nssnitt. F�r detta beh�ver ditt grafikkort och din "
-"monitor\n"
-"konfigureras. Dock kan de flesta moment g�ras automatiskt av "
-"installationen,\n"
-"och du beh�ver i princip endast kontrollera att den konfiguration som v�ljs\n"
-"�r korrekt.\n"
-"\n"
+"Klicka p� \"OK\" om du vill ta bort all data och alla partitioner som\n"
+"finns p� denna h�rddisk. Var f�rsiktig, efter det att du klickat p� \"OK\"\n"
+"kommer du inte att kunna �terst�lla n�gon data eller n�gra partitioner p�\n"
+"denna h�rddisk, inkluderande Windows-data.\n"
 "\n"
-"N�r konfigureringen �r slutf�rd, kommer X att startas (utom om du explicit\n"
-"anger att du inte vill det) s� att du kan kontrollera att allt fungerar som\n"
-"det skall. Om det inte g�r det, kan du �terv�nda och g�ra om "
-"konfigurationen,\n"
-"s� m�nga g�nger som du beh�ver."
-
-#: ../../help.pm_.c:831
-msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
-msgstr ""
-"Om n�gonting �r fel p� din X-konfiguration, anv�nd dessa inst�llningar\n"
-"f�r att konfigurera om X-servern."
+"Klicka p� \"Avbryt\" f�r att avbryta denna operation utan att f�rlora n�gon\n"
+"data eller n�gra partitioner p� denna h�rddisk."
 
-#: ../../help.pm_.c:835
-msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Om du f�redrar att logga in grafiskt, v�lj \"Ja\". Annars v�ljer du \"Nej\"."
-
-#: ../../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 ""
-"Du kan v�lja en s�kerhetsniv� f�r ditt system. Var god konsultera manualen "
-"f�r komplett\n"
-"  information. Som princip: om du inte vet vad du ska v�lja, beh�ll det "
-"f�rvalda alternativet.\n"
-
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
-"Ditt system kommer nu att startas om.\n"
-"\n"
-"Efter omstart kommer Linux-Mandrake att startas automatiskt. L�s de\n"
-"utf�rligare instruktionerna om du vill boota ett annat operativsystem."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "V�lj spr�k"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "V�lj installationsklass"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "H�rddiskdetektering"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Konfigurera mus"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "V�lj tangentbord"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "S�kerhet"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Konfigurera filsystem"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formatera partitioner"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "V�lj paket f�r installation"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Installera system"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "S�tt root-l�senord"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "L�gg till anv�ndare"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Konfigurera n�tverk"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "Sammanfattning"
+"Kan inte komma �t k�rnmoduler som motsvarar din k�rna (filen %s saknas)."
 
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Konfigurera tj�nster"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Skapa bootdisk"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Installera bootladdare"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Konfigurera X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Avsluta installationen"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3934,68 +3730,57 @@ msgstr ""
 "\n"
 "\n"
 "Dessa startas automatiskt vid uppstart. De har inga k�nda s�kerhetsproblem,\n"
-"men s�dana kan uppt�ckas. Om s� blir fallet m�ste du se till att uppgradera\n"
-"s� snabbt som m�jligt.\n"
+"men s�dana kan uppt�ckas. Om s� blir fallet m�ste du se till att uppdatera\n"
+"dem s� snabbt som m�jligt.\n"
 "\n"
 "\n"
 "Vill du installera dessa servrar?\n"
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Kan inte anv�nda broadcast utan NIS-dom�n."
 
-#: ../../install_any.pm_.c:676
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "S�tt in en FAT-formaterad floppy i enhet %s"
+msgstr "S�tt in en FAT-formaterad diskett i diskettstationen %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
-msgstr "Denna floppy �r inte FAT-formaterad"
+msgstr "Denna diskett �r inte FAT-formaterad"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
-"F�r att anv�nda detta sparade paketval, starta installationen med ''linux "
-"defcfg=floppy''"
-
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Fel vid �ppning av fil $f"
+"F�r att anv�nda detta sparade paketval, starta installationen med \"linux "
+"defcfg=floppy\"."
 
-#: ../../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 "Fel vid l�sning av fil %s"
+
+#: ../../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 "Var god testa musen"
-
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-msgid "To activate the mouse,"
-msgstr "F�r att aktivera musen,"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr "SNURRA P� HJULET!"
-
 #: ../../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 ""
-"En del h�rdvara i din dator beh�ver ''propriet�ra'' drivrutiner f�r att "
-"fungera.\n"
-"Du kan hitta en del information om dem h�r: %s"
+"En del h�rdvara i din dator beh�ver \"propriet�ra\" drivrutiner f�r att\n"
+"fungera. Du kan hitta en del information om dem h�r: %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"
@@ -4003,71 +3788,75 @@ msgid ""
 msgstr ""
 "Du m�ste ha en root-partition.\n"
 "F�r detta, skapa en partition (eller klicka p� en befintlig).\n"
-"V�lj sedan �tg�rden ''monteringspunkt'' och s�tt den som '/'"
+"V�lj sedan �tg�rden \"monteringspunkt\" och ange den som \"/\"."
 
-#: ../../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 "Du m�ste ha en swap-partition"
+msgstr "Du m�ste ha en v�xlingspartition"
 
-#: ../../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 ""
-"Du har ingen swap-partition\n"
+"Du har ingen v�xlingspartition.\n"
 "\n"
 "Forts�tta �nd�?"
 
-#: ../../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 "Du m�ste ha en FAT-partition monterad i /boot/efi."
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Anv�nd ledigt utrymme"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
-msgstr "Inte tillr�ckligt med utrymme f�r att allokera nya partitioner"
+msgstr "Inte tillr�ckligt med utrymme f�r att allokera nya partitioner."
 
-#: ../../install_interactive.pm_.c:78
+#: ../../install_interactive.pm_.c:86
 msgid "Use existing partition"
 msgstr "Anv�nd existerande partition"
 
-#: ../../install_interactive.pm_.c:80
+#: ../../install_interactive.pm_.c:88
 msgid "There is no existing partition to use"
-msgstr "Det finns ingen befintlig partition att anv�nda"
+msgstr "Det finns ingen befintlig partition att anv�nda."
 
-#: ../../install_interactive.pm_.c:87
+#: ../../install_interactive.pm_.c:95
 msgid "Use the Windows partition for loopback"
 msgstr "Anv�nd Windows-partitionen f�r loopback"
 
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:98
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Vilken partition vill du anv�nda f�r Linux4Win?"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:100
 msgid "Choose the sizes"
 msgstr "V�lj storlekar"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:101
 msgid "Root partition size in MB: "
-msgstr "Storleken p� root-partitionen i MB:"
+msgstr "Storleken p� root-partitionen i MB: "
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:102
 msgid "Swap partition size in MB: "
-msgstr "Storleken p� swap-partitionen i MB:"
+msgstr "Storleken p� v�xlingspartitionen i MB: "
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:111
 msgid "Use the free space on the Windows partition"
 msgstr "Anv�nd ledigt utrymme p� Windows-partitionen"
 
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to resize?"
 msgstr "Vilken partition vill du �ndra storlek p�?"
 
-#: ../../install_interactive.pm_.c:107
+#: ../../install_interactive.pm_.c:116
 msgid "Computing Windows filesystem bounds"
 msgstr "R�knar ut gr�nserna f�r Windows filsystem"
 
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:119
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4076,12 +3865,11 @@ msgstr ""
 "Det gick inte att �ndra storlek p� din FAT-partition, \n"
 "f�ljande fel uppstod: %s"
 
-#: ../../install_interactive.pm_.c:113
+#: ../../install_interactive.pm_.c:122
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
-msgstr ""
-"Din Windows-partition �r f�r fragmenterad, var v�nlig k�r 'Defrag'' f�rst"
+msgstr "Din Windows-partition �r f�r fragmenterad, k�r \"Defrag\" f�rst."
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4093,30 +3881,28 @@ msgid ""
 msgstr ""
 "VARNING!\n"
 "\n"
-"DrakX kommer nu att �ndra storleken p� din Windows-partition. Var "
-"f�rsiktig:\n"
-"detta moment �r riskfyllt. Om du inte redan gjort det, skall du f�rst "
-"avsluta\n"
-"installationen och k�ra Scandisk i Windows (och m�jligtvis �ven Defrag),\n"
-"starta sedan installationen p� nytt. Du b�r ocks� s�kerhetskopiera dina "
-"data.\n"
-"N�r du �r s�ker, tryck Ok."
+"DrakX kommer nu att �ndra storleken p� din Windows-partition.\n"
+"Var f�rsiktig: detta moment �r riskfyllt. Om du inte redan gjort\n"
+"det, ska du f�rst avsluta installationen och k�ra Scandisk i Windows\n"
+"(och m�jligtvis �ven Defrag), starta sedan installationen p� nytt.\n"
+"Du b�r ocks� s�kerhetskopiera dina data.\n"
+"N�r du �r s�ker, klicka Ok."
 
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:132
 msgid "Which size do you want to keep for windows on"
 msgstr "Vilken storlek vill du beh�lla f�r Windows p�"
 
-#: ../../install_interactive.pm_.c:124
+#: ../../install_interactive.pm_.c:133
 #, c-format
 msgid "partition %s"
 msgstr "partition %s"
 
-#: ../../install_interactive.pm_.c:130
+#: ../../install_interactive.pm_.c:139
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT-storleks�ndring misslyckades: %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)"
@@ -4124,63 +3910,63 @@ msgstr ""
 "Det finns ingen FAT-partition att �ndra storlek p� eller anv�nda som "
 "loopback (eller ej tillr�ckligt utrymme)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "Rensa hela h�rddisken"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Remove Windows(TM)"
-msgstr "Radera Windows(TM)"
+msgstr "Ta bort 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 "Du har mer �n en h�rddisk, vilken vill du installera Linux p�?"
 
-#: ../../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 ""
 "Alla existerande partitioner p� %s och dess data kommer att g� f�rlorade."
 
-#: ../../install_interactive.pm_.c:165
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "Anpassad diskpartitionering"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:178
 msgid "Use fdisk"
 msgstr "Anv�nd fdisk"
 
-#: ../../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 ""
 "Du kan nu partitionera %s.\n"
-"Gl�m inte att spara med 'w' n�r du �r klar."
+"Gl�m inte att spara med \"w\" n�r du �r klar."
 
-#: ../../install_interactive.pm_.c:201
+#: ../../install_interactive.pm_.c:210
 msgid "You don't have enough free space on your Windows partition"
-msgstr "Du har inte tillr�ckligt med utrymme p� din Windows-partition"
+msgstr "Du har inte tillr�ckligt med utrymme p� din Windows-partition."
 
-#: ../../install_interactive.pm_.c:217
+#: ../../install_interactive.pm_.c:226
 msgid "I can't find any room for installing"
-msgstr "Jag kan inte finna utrymme f�r installation"
+msgstr "Jag kan inte hitta utrymme f�r installation."
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:230
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "DrakXs partitionerings-wizard hittade f�ljande l�sningar:"
+msgstr "DrakXs partitioneringsguide hittade f�ljande l�sningar:"
 
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:235
 #, c-format
 msgid "Partitioning failed: %s"
-msgstr "Partitionering mysslyckades: %s"
+msgstr "Partitionering misslyckades: %s"
 
-#: ../../install_interactive.pm_.c:232
+#: ../../install_interactive.pm_.c:241
 msgid "Bringing up the network"
 msgstr "Startar n�tverket"
 
-#: ../../install_interactive.pm_.c:237
+#: ../../install_interactive.pm_.c:246
 msgid "Bringing down the network"
 msgstr "Stoppar n�tverket"
 
@@ -4192,12 +3978,12 @@ msgstr ""
 "Ett fel uppstod och jag vet inte hur det kan hanteras p� ett\n"
 "bra s�tt. Forts�tt p� egen risk."
 
-#: ../../install_steps.pm_.c:203
+#: ../../install_steps.pm_.c:207
 #, c-format
 msgid "Duplicate mount point %s"
-msgstr "Duplikerad monteringspunkt %s"
+msgstr "Duplicera monteringspunkt %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"
@@ -4205,25 +3991,24 @@ msgid ""
 "\"\n"
 msgstr ""
 "N�gra viktiga paket blev inte installerade ordentligt.\n"
-"Antingen �r din CD-ROM-enhet eller din CD-skiva trasig.\n"
-"Du kan kontrollera CD-skrivan fr�n en redan installerad\n"
-"Linux-Mandrake-dator med kommandot\n"
-"'rpm -qpl Mandrake/RPMS/*.rpm'\n"
+"Antingen �r din CD-romenhet eller din CD-skiva trasig.\n"
+"Du kan kontrollera CD-skivan p� en redan installerad\n"
+"Mandrake Linux-dator med kommandot \"rpm -qpl Mandrake/RPMS/*.rpm\".\n"
 
-#: ../../install_steps.pm_.c:451
+#: ../../install_steps.pm_.c:459
 #, c-format
 msgid "Welcome to %s"
 msgstr "V�lkommen till %s"
 
-#: ../../install_steps.pm_.c:634
+#: ../../install_steps.pm_.c:506 ../../install_steps.pm_.c:709
 msgid "No floppy drive available"
-msgstr "Ingen diskettenhet tillg�nglig"
+msgstr "Ingen diskettstation tillg�nglig"
 
-#: ../../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 "P�b�rjar steg `%s'\n"
+msgstr "P�b�rjar steg \"%s\"\n"
 
 #: ../../install_steps_graphical.pm_.c:287
 msgid "Choose the size you want to install"
@@ -4233,32 +4018,32 @@ msgstr "V�lj storlek du vill installera:"
 msgid "Total size: "
 msgstr "Total storlek: "
 
-#: ../../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 "Version: %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 "Storlek: %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 "V�lj paketen som du vill installera"
 
-#: ../../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"
+msgstr "Information"
 
-#: ../../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 "Installera"
 
-#: ../../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 "Installerar"
 
@@ -4266,7 +4051,7 @@ msgstr "Installerar"
 msgid "Please wait, "
 msgstr "Var god v�nta, "
 
-#: ../../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 "�terst�ende tid "
 
@@ -4275,21 +4060,21 @@ msgid "Total time "
 msgstr "Total tid "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:695
 msgid "Preparing installation"
 msgstr "F�rbereder installation"
 
-#: ../../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 "Installerar paketet %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 "Forts�tt �nd�?"
+msgstr "Forts�tta �nd�?"
 
-#: ../../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 "Det uppstod ett fel vid sortering av paket:"
 
@@ -4297,29 +4082,33 @@ msgstr "Det uppstod ett fel vid sortering av paket:"
 msgid "Use existing configuration for X11?"
 msgstr "Anv�nd existerande konfiguration f�r 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 ""
 "Ditt system har ont om resurser. Du kan f� problem med att installera\n"
-"Linux-Mandrake. Om det blir problem kan du testa textbaserad installation\n"
-"ist�llet. F�r att g�ra det tryck F1 n�r du startar fr�n CD, skriv sedan "
-"'text'."
+"Mandrake Linux. Om det blir problem kan du prova den textbaserade\n"
+"installationen ist�llet. F�r att g�ra det tryck F1 n�r du startar\n"
+"fr�n CD-skivan, skriv sedan \"text\"."
 
-#: ../../install_steps_gtk.pm_.c:156
+#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:187
+msgid "Install Class"
+msgstr "Installationsklass"
+
+#: ../../install_steps_gtk.pm_.c:162
 msgid "Please, choose one of the following classes of installation:"
-msgstr "Var god v�lj en av de f�ljande installationsklasserna:"
+msgstr "V�lj en av de f�ljande installationsklasserna:"
 
-#: ../../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 "Den totala storleken f�r de grupper du har valt �r ungef�r %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"
@@ -4330,10 +4119,10 @@ msgid ""
 msgstr ""
 "Om du vill installera mindre �n detta, v�lj d� hur stor del av\n"
 "paketen du vill installera. Vid en l�g andel kommer endast de\n"
-"viktigaste paketen installeras. Om du v�ljer 100%%, kommer alla\n"
+"viktigaste paketen att installeras. Om du v�ljer 100%%, kommer alla\n"
 "valda paket att installeras."
 
-#: ../../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"
@@ -4346,114 +4135,114 @@ msgstr ""
 "Endast %d%% av de valda paketen f�r plats p� din h�rddisk.\n"
 "Om du vill installera mindre �n detta, v�lj d� hur stor del av\n"
 "paketen du vill installera. Vid en l�g andel kommer endast de\n"
-"viktigaste paketen installeras. Om du v�ljer %d%%, kommer s�\n"
+"viktigaste paketen att installeras. Om du v�ljer %d%%, kommer s�\n"
 "m�nga paket som m�jligt att installeras."
 
-#: ../../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 ""
-"Du kommer att f� v�lja exakt vilka paket som skall installeras i n�sta steg."
+"Du kommer att f� v�lja exakt vilka paket som ska installeras i n�sta steg."
 
-#: ../../install_steps_gtk.pm_.c:237
+#: ../../install_steps_gtk.pm_.c:243
 msgid "Percentage of packages to install"
-msgstr "Andel (i procent) av paketen som skall installeras"
+msgstr "Andel (i procent) av paketen som ska installeras"
 
-#: ../../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 "Val av paketgrupper"
 
-#: ../../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 "V�lj enskilda paket"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr "Visa automatiskt valda paket"
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "Expandera tr�d"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "Komprimera tr�d"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "Byt mellan rak och gruppvis sortering"
+#: ../../install_steps_gtk.pm_.c:343 ../../install_steps_interactive.pm_.c:598
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Total storlek: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:385
 msgid "Bad package"
 msgstr "Ogiltigt paket"
 
-#: ../../install_steps_gtk.pm_.c:436
+#: ../../install_steps_gtk.pm_.c:386
 #, c-format
 msgid "Name: %s\n"
 msgstr "Namn: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:439
+#: ../../install_steps_gtk.pm_.c:389
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Betydelsegrad: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:448 ../../install_steps_interactive.pm_.c:578
-#, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Total storlek: %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 ""
 "Du kan inte v�lja detta paket eftersom det inte finns tillr�ckligt med "
-"utrymme"
+"utrymme."
 
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:416
 msgid "The following packages are going to be installed"
 msgstr "F�ljande paket kommer att installeras"
 
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:417
 msgid "The following packages are going to be removed"
 msgstr "F�ljande paket kommer att tas bort"
 
-#: ../../install_steps_gtk.pm_.c:482
+#: ../../install_steps_gtk.pm_.c:429
 msgid "You can't select/unselect this package"
-msgstr "Du kan inte v�lja/v�lja bort detta paket"
+msgstr "Du kan inte v�lja/v�lja bort detta paket."
 
-#: ../../install_steps_gtk.pm_.c:501
+#: ../../install_steps_gtk.pm_.c:441
 msgid "This is a mandatory package, it can't be unselected"
-msgstr "Detta �r ett obligatoriskt paket som inte kan v�ljas bort"
+msgstr "Detta �r ett obligatoriskt paket som inte kan v�ljas bort."
 
-#: ../../install_steps_gtk.pm_.c:503
+#: ../../install_steps_gtk.pm_.c:443
 msgid "You can't unselect this package. It is already installed"
-msgstr "Du kan inte v�lja bort detta paket. Det �r redan installerat"
+msgstr "Du kan inte v�lja bort detta paket. Det �r redan installerat."
 
-#: ../../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 ""
-"Detta paketet m�ste uppgraderas.\n"
+"Detta paketet m�ste uppdateras.\n"
 "�r du s�ker p� att du vill v�lja bort det?"
 
-#: ../../install_steps_gtk.pm_.c:510
+#: ../../install_steps_gtk.pm_.c:451
 msgid "You can't unselect this package. It must be upgraded"
-msgstr "Du kan inte v�lja bort det h�r paketet. Det m�ste uppgraderas."
+msgstr "Du kan inte v�lja bort det h�r paketet. Det m�ste uppdateras."
+
+#: ../../install_steps_gtk.pm_.c:456
+msgid "Show automatically selected packages"
+msgstr "Visa automatiskt valda paket"
+
+#: ../../install_steps_gtk.pm_.c:460
+msgid "Load/Save on floppy"
+msgstr "Ladda/spara p� diskett"
+
+#: ../../install_steps_gtk.pm_.c:461
+msgid "Updating package selection"
+msgstr "Uppdaterar paketval"
 
-#: ../../install_steps_gtk.pm_.c:563
+#: ../../install_steps_gtk.pm_.c:466
+msgid "Minimal install"
+msgstr "Minimal installation"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "Uppskattar"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 msgid "Please wait, preparing installation"
-msgstr "Var god v�nta, f�rbereder installation"
+msgstr "V�nta, f�rbereder installation"
 
-#: ../../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"
@@ -4487,40 +4276,40 @@ msgstr ""
 "\n"
 "Varning\n"
 "\n"
-"Var god l�s reglerna nedan noga. Om du inte godk�nner dem, f�r du\n"
-"inte installera program fr�n n�sta CD.  Tryck 'V�grar' f�r att\n"
+"L�s reglerna nedan noga. Om du inte godk�nner dem, f�r du\n"
+"inte installera program fr�n n�sta CD. Klicka p� \"V�grar\" f�r att\n"
 "forts�tta installationen utan programmen fr�n n�sta CD.\n"
 "\n"
 "\n"
 "N�gra av komponenterna p� n�sta CD �r inte licensierade under GPL\n"
 "eller n�gon liknande licens. Varje s�dan komponent �r i st�llet\n"
-"licensierad under sitt eget licensavtal. Var god l�s och godk�nn varje\n"
-"enskilld s�dan licens f�re anv�ndning eller distribuering av dessa\n"
+"licensierad under sitt eget licensavtal. L�s och godk�nn varje\n"
+"enskild s�dan licens f�re anv�ndning eller distribuering av dessa\n"
 "komponenter. De flesta av dessa licenser f�rbjuder �verf�ring,\n"
 "kopiering (utom f�r backupendam�l), distribuering samt modifiering av\n"
 "komponenten. Alla brott mot reglerna under n�gon av dessa licenser,\n"
 "f�rverkar omedelbart dina r�ttigheter under licensen i fr�ga. Utom i\n"
-"de fall licensen f�r en komponent explicit ger dig den r�ttigheten,\n"
+"de fall licensen f�r en komponent uttryckligen ger dig den r�ttigheten,\n"
 "f�r du inte installera komponenten p� mer �n ett system, eller f�r\n"
-"anv�ndning p� ett n�tverk. Om du �r os�ker, var god kontakta\n"
+"anv�ndning p� ett n�tverk. Om du �r os�ker, kontakta\n"
 "tillverkaren av komponenten i fr�ga. Kopiering till tredje part av\n"
 "s�dana komponenter, inkluderat deras dokumentation, �r normalt sett\n"
 "f�rbjuden.\n"
 "\n"
 "\n"
-"Alla r�ttigheter till komponenterna p� n�sta CD tillh�t deras\n"
+"Alla r�ttigheter till komponenterna p� n�sta CD tillh�r deras\n"
 "respektive upphovsm�n, och �r skyddade av\n"
-"imaterialr�tt/copyright-lagstifning som kan appliceras p� mjukvara.\n"
+"imaterialr�tt/copyright-lagstiftning som kan appliceras p� mjukvara.\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 "Accepterar"
 
-#: ../../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 "V�grar"
 
-#: ../../install_steps_gtk.pm_.c:681
+#: ../../install_steps_gtk.pm_.c:628
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4531,11 +4320,11 @@ msgid ""
 msgstr ""
 "Byt CD-skiva!\n"
 "\n"
-"Var god s�tt in CD-skivan d�pt \"%s\" och klicka p� Ok.\n"
-"Om du inte har den, klicka p� Avbryt f�r att hoppa �ver den delen av "
-"installationen."
+"S�tt in CD-skivan med namn \"%s\" och klicka p� \"Ok\".\n"
+"Om du inte har den, klicka p� \"Avbryt\" f�r att hoppa �ver\n"
+"den delen av installationen."
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "Det uppstod ett fel vid installation av paketen:"
 
@@ -4543,36 +4332,21 @@ msgstr "Det uppstod ett fel vid installation av paketen:"
 msgid "An error occurred"
 msgstr "Ett fel intr�ffade"
 
-#: ../../install_steps_interactive.pm_.c:55
-msgid "Please, choose a language to use."
-msgstr "Var god v�lj ett spr�k att anv�nda"
-
-#: ../../install_steps_interactive.pm_.c:56
-msgid "You can choose other languages that will be available after install"
-msgstr ""
-"Du kan v�lja ytterligare spr�k som ska finnas tillg�ngliga efter "
-"installationen"
-
-#: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:613
-msgid "All"
-msgstr "Alla"
-
-#: ../../install_steps_interactive.pm_.c:86
+#: ../../install_steps_interactive.pm_.c:71
 msgid "License agreement"
 msgstr "Licensavtal"
 
-#: ../../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"
@@ -4626,7 +4400,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"
@@ -4663,7 +4437,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"
@@ -4683,47 +4457,47 @@ msgid ""
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 msgstr ""
 "Detta �r en inofficiell �vers�ttning av licensavtalet f�r\n"
-"Linux-Mandrake. Denna text best�mmer inte reglerna f�r mjukvara i\n"
+"Linux Mandrake. Denna text best�mmer inte reglerna f�r mjukvara i\n"
 "denna distribution - endast den franska originaltexten f�r\n"
-"Linux-Mandrake-licensen g�r det. Denna text tillhandah�lls f�r att\n"
+"Linux Mandrake-licensen g�r det. Denna text tillhandah�lls f�r att\n"
 "hj�lpa dig som svensktalande att f�rst� licensen b�ttre.\n"
 "\n"
 "\n"
 "Introduktion\n"
 "\n"
-" H�dan�fter avses med beteckningen \"Mjukvaruprodukter\",\n"
+" H�danefter avses med beteckningen \"Mjukvaruprodukter\",\n"
 "operativsystemet, samt de olika komponenter som ing�r i\n"
-"Linux-Mandrake-distributionen. Mjukvaruprodukterna inkluderar, men �r\n"
+"Mandrake Linux-distributionen. Mjukvaruprodukterna inkluderar, men �r\n"
 "inte begr�nsade till, programmen, metoderna, reglerna och\n"
 "dokumentationen relaterade till operativsystemet och de olika\n"
-"komponenterna i Linux-Mandrake-distributionen.\n"
+"komponenterna i Mandrake Linux-distributionen.\n"
 "\n"
 "\n"
 "1. Licens\n"
 "\n"
-" Var god l�s denna text noggrannt. Den �r en licensavtal mellan dig\n"
-"och MandrakeSoft S.A., g�llande Mjukvaruprodukterna. Genom att\n"
-"installera, kopiera, eller anv�nda Mjukvaruprodukterna p� n�got s�tt,\n"
+" L�s denna text noggrant. Den �r en licensavtal mellan dig\n"
+"och MandrakeSoft S.A., g�llande mjukvaruprodukterna. Genom att\n"
+"installera, kopiera, eller anv�nda mjukvaruprodukterna p� n�got s�tt,\n"
 "accepterar du detta avtal, och godk�nner att r�tta dig efter dess\n"
 "regler.\n"
-" Genom att installera, kopiera eller anv�nda Mjukvaruprodukterna p�\n"
+" Genom att installera, kopiera eller anv�nda mjukvaruprodukterna p�\n"
 "n�got s�tt som inte till�ts enligt detta avtal, har du brutit avtalet,\n"
 "som d� upph�r, och d�rigenom f�rverkat alla de r�ttigheter det ger\n"
 "dig. Skulle avtalet upph�ra, m�ste du omedelbart f�rst�ra alla kopior\n"
-"av Mjukvaruprodukten.\n"
+"av mjukvaruprodukten.\n"
 "\n"
 "\n"
 "2. Begr�nsad garanti\n"
 "\n"
-" Mjukvaruprodokten och medf�ljande dokumentation tillhandah�lls \"som\n"
+" Mjukvaruprodukten och medf�ljande dokumentation tillhandah�lls \"som\n"
 "den �r\", utan n�gon som helst garanti, endast begr�nsat av vad lagen\n"
 "kr�ver. MandrakeSoft S.A. skall, under inga omst�ndigheter, till den\n"
 "grad lagen till�ter det, h�llas ansvariga f�r olycks-, direkt eller\n"
 "indirekt skada (bland annat, men inte begr�nsat till, minskad\n"
-"f�rs�ljning, drifts-/aff�rs-avbrott, financiella f�rluster,\n"
+"f�rs�ljning, drifts-/aff�rs-avbrott, finansiella f�rluster,\n"
 "r�ttsavgifter och b�ter i en r�ttsprocess mot er, eller n�gra andra\n"
 "d�rav f�ljande f�rluster) som orsakats av anv�ndandet, eller of�rm�gan\n"
-"att anv�nda Mjukvaruprodukten, �ven om MandrakeSoft S.A. skulle ha\n"
+"att anv�nda mjukvaruprodukten, �ven om MandrakeSoft S.A. skulle ha\n"
 "vetskap m�jligheten av en s�dan h�ndelse.\n"
 "\n"
 "BEGR�NSAT ANSVAR G�LLANDE �GANDET ELLER ANV�NDANDET AV PROGRAMVARA F�RBJUDEN "
@@ -4732,10 +4506,10 @@ msgstr ""
 " MandrakeSoft S.A. skall, under inga omst�ndigheter, till den grad\n"
 "lagen till�ter det, h�llas ansvariga f�r olycks-, direkt eller\n"
 "indirekt skada (bland annat, men inte begr�nsat till, minskad\n"
-"f�rs�ljning, drifts-/aff�rs-avbrott, financiella f�rluster,\n"
+"f�rs�ljning, drifts-/aff�rs-avbrott, finansiella f�rluster,\n"
 "r�ttsavgifter och b�ter i en r�ttsprocess mot er, eller n�gra andra\n"
 "d�rav f�ljande f�rluster) som orsakats av �gandet, anv�ndandet eller\n"
-"nedladdandet, fr�n n�gon av Linux-Mandrakes siter, av\n"
+"nedladdandet, fr�n n�gon av Mandrake Linuxs siter, av\n"
 "mjukvarukomponenter som �r f�rbjudna eller begr�nsade av landets\n"
 "lagar. Detta begr�nsade ansvar g�ller bland annat, men �r inte\n"
 "begr�nsat till, det kryptografiska mjukvarukomponenter som ing�r i\n"
@@ -4749,7 +4523,7 @@ msgstr ""
 "The GNU General Public License, h�danefter kallad \"GPL\", eller\n"
 "liknande licenser. De flesta av dessa licenser till�ter dig att\n"
 "anv�nda, kopiera, �ndra och distribuera de licensierade\n"
-"komponenterna. Var god l�s avtalet f�r varje enskilld komponent noga\n"
+"komponenterna. L�s avtalet f�r varje enskild komponent noga\n"
 "innan ni anv�nder komponenten i fr�ga. Varje fr�ga ang�ende licensen\n"
 "f�r en given komponent skall st�llas till komponentens upphovsman,\n"
 "inte till MandrakeSoft S.A.\n"
@@ -4765,7 +4539,7 @@ msgstr ""
 "immaterialr�tt/copyrightlagstiftning som kan appliceras p� mjukvara.\n"
 " MandrakeSoft S.A. har r�tt att �ndra mjukvaruprodukten, helt eller\n"
 "delvis, p� alla s�tt och f�r alla �ndam�l.\n"
-" \"Mandrake\", \"Linux-Mandrake\" och assicierade logotyper �r\n"
+" \"Mandrake\", \"Mandrake Linux\" och associerade logotyper �r\n"
 "registrerade varum�rken tillh�rande MandrakeSoft S.A.\n"
 "\n"
 "\n"
@@ -4779,106 +4553,102 @@ msgstr ""
 " Alla stridigheter �ver reglerna i detta avtal skall i f�rsta hand\n"
 "g�ras upp utom domstol, och om detta ej �r m�jligt, inom en domstol i\n"
 "Paris, Frankrike.\n"
-" F�r alla fr�gor r�rande denna text, var god kontakta MandrakeSoft\n"
+" F�r alla fr�gor r�rande denna text, kontakta MandrakeSoft\n"
 "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 "Tangentbord"
 
-#: ../../install_steps_interactive.pm_.c:183
+#: ../../install_steps_interactive.pm_.c:169
 #: ../../standalone/keyboarddrake_.c:29
 msgid "Please, choose your keyboard layout."
-msgstr "V�nligen v�lj din tangentbordslayout."
+msgstr "V�lj din tangentbordslayout."
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:170
 msgid "Here is the full list of keyboards available"
-msgstr "H�r �r hela listan med olika tangenbord"
+msgstr "H�r �r hela listan med olika tangentbord"
 
-#: ../../install_steps_interactive.pm_.c:201
-msgid "Install Class"
-msgstr "Installationsklass"
-
-#: ../../install_steps_interactive.pm_.c:201
+#: ../../install_steps_interactive.pm_.c:187
 msgid "Which installation class do you want?"
-msgstr "Vilken installationsklass vill du ha?"
+msgstr "Vilken installationsklass vill du anv�nda?"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Install/Update"
-msgstr "Installera/Uppgradera"
+msgstr "Installera/Uppdatera"
 
-#: ../../install_steps_interactive.pm_.c:203
+#: ../../install_steps_interactive.pm_.c:189
 msgid "Is this an install or an update?"
-msgstr "�r detta en installation eller en uppgradering?"
+msgstr "�r detta en installation eller en uppdatering?"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:198
 msgid "Recommended"
 msgstr "Rekommenderad"
 
-#: ../../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 "Uppgradera"
+msgstr "Uppdatera"
 
-#: ../../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 "Var god v�lj din mustyp."
+msgstr "V�lj din mustyp."
 
-#: ../../install_steps_interactive.pm_.c:244 ../../standalone/mousedrake_.c:57
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "Musport"
 
-#: ../../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 "V�lj vilken serieport din mus �r kopplad till."
 
-#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:239
 msgid "Buttons emulation"
 msgstr "Knappemulering"
 
-#: ../../install_steps_interactive.pm_.c:255
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Button 2 Emulation"
 msgstr "Knapp 2-emulering"
 
-#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:242
 msgid "Button 3 Emulation"
 msgstr "Knapp 3-emulering"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:261
 msgid "Configuring PCMCIA cards..."
 msgstr "Konfigurerar PCMCIA-kort..."
 
-#: ../../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 "Konfigurerar 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 "inga tillg�ngliga partitioner"
 
-#: ../../install_steps_interactive.pm_.c:298
+#: ../../install_steps_interactive.pm_.c:284
 msgid "Scanning partitions to find mount points"
 msgstr "S�ker av partitioner f�r att finna monteringspunkter"
 
-#: ../../install_steps_interactive.pm_.c:306
+#: ../../install_steps_interactive.pm_.c:292
 msgid "Choose the mount points"
 msgstr "V�lj monteringspunkter"
 
-#: ../../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"
@@ -4888,114 +4658,155 @@ msgid ""
 "\n"
 "Do you agree to loose all the partitions?\n"
 msgstr ""
-"Jag kan inte l�sa din partitionstabell - den �r alldeles f�r trasig :(\n"
+"Din partitionstabell kan inte l�sas - den �r alldeles f�r trasig.\n"
 "Jag kan g� vidare genom att rensa d�liga partitioner (ALL DATA f�rsvinner!)\n"
-"Den andra l�sning �r att f�rhindra DrakX fr�n att modifiera "
+"Den andra l�sningen �r att f�rhindra DrakX fr�n att �ndra "
 "partitionstabellen.\n"
 "(felet �r %s)\n"
 "\n"
 "Accepterar du att f�rlora alla partitioner?\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 misslyckades med att l�sa din partitionstabell korrekt.\n"
+"Diskdrake misslyckades med att l�sa din partitionstabell.\n"
 "Forts�tt p� egen risk!"
 
-#: ../../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 ""
+"Inget ledigt utrymme f�r 1MB bootstrap! Installationen forts�tter, men f�r "
+"att starta ditt system m�ste du skapa en \"bootstrap\"-partition i Diskdrake."
+
+#: ../../install_steps_interactive.pm_.c:349
+msgid "No root partition found to perform an upgrade"
+msgstr "Ingen root-partition hittades f�r uppdatering."
+
+#: ../../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 "Vad �r root-partitionen (/) i ditt system?"
 
-#: ../../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 ""
 "Du beh�ver starta om datorn f�r att �ndringarna i partitionstabellen ska "
-"aktiveras"
+"aktiveras."
 
-#: ../../install_steps_interactive.pm_.c:403
+#: ../../install_steps_interactive.pm_.c:389
 msgid "Choose the partitions you want to format"
-msgstr "V�lj de partitioner som du vill formatera"
+msgstr "V�lj de partitioner du vill formatera"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:390
 msgid "Check bad blocks?"
 msgstr "S�k efter felaktiga block?"
 
-#: ../../install_steps_interactive.pm_.c:427
+#: ../../install_steps_interactive.pm_.c:416
 msgid "Formatting partitions"
 msgstr "Formaterar partitioner"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:418
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Skapar och formaterar filen %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
-"Ej tillr�ckligt med swap f�r att genomf�ra installationen, v.g. l�gg till mer"
+"Ej tillr�ckligt med v�xlingsutrymme f�r att genomf�ra installationen, l�gg "
+"till mer."
 
-#: ../../install_steps_interactive.pm_.c:438
+#: ../../install_steps_interactive.pm_.c:427
 msgid "Looking for available packages"
 msgstr "S�ker efter tillg�ngliga paket"
 
-#: ../../install_steps_interactive.pm_.c:444
+#: ../../install_steps_interactive.pm_.c:433
 msgid "Finding packages to upgrade"
-msgstr "S�ker efter paket att uppgradera"
+msgstr "S�ker efter paket att uppdatera"
 
-#: ../../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 ""
 "Ditt system har inte tillr�ckligt med utrymme f�r installation eller "
-"uppgradering (%d > %d)"
+"uppdatering (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Fullst�ndig (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimal (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:469
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Rekommenderad (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:486
+#: ../../install_steps_interactive.pm_.c:475
 msgid "Custom"
 msgstr "Anpassad"
 
-#: ../../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 ""
+"V�lj ladda eller spara paketval p� diskett.\n"
+"Formatet �r detsamma som f�r auto_install-genererade disketter."
+
+#: ../../install_steps_interactive.pm_.c:525
+msgid "Load from floppy"
+msgstr "Ladda fr�n diskett"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Loading from floppy"
+msgstr "Laddar fr�n diskett"
+
+#: ../../install_steps_interactive.pm_.c:527
+msgid "Package selection"
+msgstr "Paketval"
+
+#: ../../install_steps_interactive.pm_.c:532
+msgid "Insert a floppy containing package selection"
+msgstr "S�tt in en diskett som inneh�ller ditt paketval"
+
+#: ../../install_steps_interactive.pm_.c:544
+msgid "Save on floppy"
+msgstr "Spara p� diskett"
+
+#: ../../install_steps_interactive.pm_.c:605
 msgid "Selected size is larger than available space"
 msgstr "Vald storlek �r st�rre �n tillg�ngligt utrymme."
 
-#: ../../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 ""
-"Om du har alla CD-skivorna i listan ovan, v�lj OK.\n"
-"Om du inte har n�gon av dem, v�lj Avbryt.\n"
+"Om du har alla CD-skivorna i listan ovan, v�lj \"Ok\".\n"
+"Om du inte har n�gon av dem, v�lj \"Avbryt\".\n"
 "Om du bara har n�gra av dem, se till att bara\n"
-"de du har �r valda, och v�lj sedan OK."
+"de du har �r valda, v�lj sedan \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr "CD-ROM med etiketten \"%s\""
+msgstr "CD-rom med etiketten \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5004,11 +4815,21 @@ msgstr ""
 "Installerar paket %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:693
+#: ../../install_steps_interactive.pm_.c:713
 msgid "Post-install configuration"
-msgstr "Efter-installations-konfigurering"
+msgstr "Efter-installationskonfigurering"
+
+#: ../../install_steps_interactive.pm_.c:719
+#, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr "S�tt in aktuell startdiskett i diskettstationen %s"
+
+#: ../../install_steps_interactive.pm_.c:725
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "S�tt in disketten med uppdaterade moduler i diskettstationen %s"
 
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../install_steps_interactive.pm_.c:750
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -5086,93 +4907,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 "V�lj en webbplats fr�n vilken du vill ta paketen"
+msgstr "V�lj en webbplats fr�n vilken du vill h�mta paketen"
 
-#: ../../install_steps_interactive.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:793
 msgid "Contacting the mirror to get the list of available packages"
-msgstr "Kontaktar webbplatsen f�r lista �ver tillg�ngliga paket"
+msgstr "Kontaktar webbplatsen f�r en lista �ver tillg�ngliga paket"
 
-#: ../../install_steps_interactive.pm_.c:764
+#: ../../install_steps_interactive.pm_.c:796
 msgid "Please choose the packages you want to install."
-msgstr "V�lj paketen som du vill installera"
+msgstr "V�lj paketen du vill installera"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:808
 msgid "Which is your timezone?"
 msgstr "Vilken �r din tidszon?"
 
-#: ../../install_steps_interactive.pm_.c:778
-msgid "Is your hardware clock set to GMT?"
-msgstr "�r din h�rdvaruklocka st�lld till GMT?"
+#: ../../install_steps_interactive.pm_.c:813
+msgid "Hardware clock set to GMT"
+msgstr "H�rdvaruklocka st�lld till GMT"
+
+#: ../../install_steps_interactive.pm_.c:814
+msgid "Automatic time synchronization (using NTP)"
+msgstr "Automatisk tidsynkronisering (med NTP)"
 
-#: ../../install_steps_interactive.pm_.c:806 ../../printer.pm_.c:22
-#: ../../printerdrake.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:821
+msgid "NTP Server"
+msgstr "NTP-server"
+
+#: ../../install_steps_interactive.pm_.c:855
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:104
 msgid "Remote CUPS server"
-msgstr "Remote CUPS-server"
+msgstr "CUPS-fj�rrserver"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "Ingen skrivare"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:867 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Sammanfattning"
+
+#: ../../install_steps_interactive.pm_.c:870
 msgid "Mouse"
 msgstr "Mus"
 
-#: ../../install_steps_interactive.pm_.c:823
+#: ../../install_steps_interactive.pm_.c:872
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: ../../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 "Skrivare"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:875
 msgid "ISDN card"
 msgstr "ISDN-kort"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Ljudkort"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "TV-kort"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "Vilket utskriftssystem vill du anv�nda?"
+#: ../../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 "Lokala filer"
+
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:929 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Ange root-l�senord"
 
-#: ../../install_steps_interactive.pm_.c:896
+#: ../../install_steps_interactive.pm_.c:930
 msgid "No password"
 msgstr "Inget l�senord"
 
-#: ../../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 "L�senordet �r f�r enkelt (det m�ste vara minst %d tecken l�ngt)"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "Use NIS"
-msgstr "Anv�nd NIS"
+#: ../../install_steps_interactive.pm_.c:941 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:604
+msgid "Authentication"
+msgstr "Autentisering"
 
-#: ../../install_steps_interactive.pm_.c:907
-msgid "yellow pages"
-msgstr "yellow pages"
+#: ../../install_steps_interactive.pm_.c:949
+msgid "Authentication LDAP"
+msgstr "LDAP-autentisering"
 
-#: ../../install_steps_interactive.pm_.c:914
-msgid "Authentification NIS"
-msgstr "Autentisiering NIS"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr "LDAP Base DN"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:951
+msgid "LDAP Server"
+msgstr "LDAP-server"
+
+#: ../../install_steps_interactive.pm_.c:957
+msgid "Authentication NIS"
+msgstr "NIS-autentisering"
+
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "NIS-dom�n"
 
-#: ../../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 "
@@ -5190,32 +5051,33 @@ msgid ""
 "drive and press \"Ok\"."
 msgstr ""
 "En anpassad startdiskett skapar ett s�tt att starta ditt Linux-system utan\n"
-"att vara beroende av den normala bootladdaren. Det �r anv�ndbart om du inte\n"
+"att vara beroende av den normala starthanteraren. Det �r anv�ndbart om du "
+"inte\n"
 "vill installera SILO p� ditt system, eller om n�got annat operativsystem "
 "raderar SILO\n"
-"eller om SILO inte fungerar med din h�rdvara. En anpassad bootdiskett kan "
+"eller om SILO inte fungerar med din h�rdvara. En anpassad startdiskett kan "
 "ocks�\n"
-"anv�ndas i kombination med Mandrakes �terskapnings-image, vilket g�r "
+"anv�ndas i kombination med Mandrakes �terskapningsavbild, vilket g�r "
 "r�ddning\n"
-"av ett falerat system mycket enklare.\n"
+"av ett trasigt system mycket enklare.\n"
 "\n"
 "Om du vill skapa en startdiskett f�r ditt system, s�tt in en disk i f�rsta "
 "diskett-\n"
-"enheten och tryck \"Ok\"."
+"stationen och klicka \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "F�rsta diskettstationen"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Andra diskettstationen"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "Hoppa �ver"
 
-#: ../../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 "
@@ -5229,42 +5091,52 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 "En anpassad startdiskett skapar ett s�tt att starta ditt Linux-system utan\n"
-"att vara beroende av den normala bootladdaren. Det �r anv�ndbart om du inte\n"
-"vill installera LILO (eller grub) p� ditt system, eller om n�got annat "
-"operativsystem raderar LILO\n"
-"eller om LILO inte fungerar med din h�rdvara. En anpassad bootdiskett kan "
-"ocks�\n"
-"anv�ndas i kombination med Mandrakes �terskapnings-image, vilket g�r "
-"r�ddning\n"
-"av ett falerat system mycket enklare. Vill du skapa en startdiskett f�r ditt "
-"system?"
-
-#: ../../install_steps_interactive.pm_.c:983
+"att vara beroende av den normala starthanteraren. Det �r anv�ndbart om du\n"
+"inte vill installera LILO (eller grub) p� ditt system, eller om n�got annat\n"
+"operativsystem raderar LILO eller om LILO inte fungerar med din h�rdvara.\n"
+"En anpassad startdiskett kan ocks� anv�ndas i kombination med Mandrakes\n"
+"�terskapningsavbild, vilket g�r �terst�llningen av ett trasigt system "
+"mycket\n"
+"enklare. Vill du skapa en startdiskett f�r ditt system?"
+
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
-msgstr "Ingen diskettenhet hittades"
+msgstr "Ingen diskettstation hittades"
 
-#: ../../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 "V�lj den diskettenhet du vill anv�nda f�r att skapa bootdisketten"
+msgstr "V�lj den diskettstation du vill anv�nda f�r att skapa startdisketten"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
-msgstr "S�tt in en tom diskett i diskettenhet %s"
+msgstr "S�tt in en tom diskett i diskettstationen %s"
 
-#: ../../install_steps_interactive.pm_.c:994
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "Skapar startdiskett"
 
-#: ../../install_steps_interactive.pm_.c:1001
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
-msgstr "F�rbereder bootladdaren"
+msgstr "F�rbereder starthanterare"
 
-#: ../../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 ""
+"Du verkar ha en OldWorld eller ok�nd\n"
+" maskin, yaboot-starthanteraren kommer inte att fungera.\n"
+"Installationen forts�tter, men du beh�ver\n"
+" anv�nda BootX f�r att starta din dator."
+
+#: ../../install_steps_interactive.pm_.c:1060
 msgid "Do you want to use aboot?"
 msgstr "Vill du anv�nda 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?"
@@ -5272,59 +5144,59 @@ msgstr ""
 "Fel vid installationen av aboot.\n"
 "Vill du f�rs�ka �nd�, fast det kan f�rst�ra partitionen?"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1070
+msgid "Installing bootloader"
+msgstr "Installerar starthanterare"
+
+#: ../../install_steps_interactive.pm_.c:1076
 msgid "Installation of bootloader failed. The following error occured:"
-msgstr "Installation av bootladdaren misslyckades. F�ljande fel uppstod:"
+msgstr "Installation av starthanteraren misslyckades. F�ljande fel uppstod:"
 
-#: ../../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 ""
-"Du beh�ver eventuellt �ndra din Open Firmware-bootenhet f�r att\n"
-" aktivera bootladdaren. Om du inte ser bootladdarprompten vid\n"
+"Du beh�ver eventuellt �ndra din Open Firmware-startenhet f�r att\n"
+" aktivera starthanteraren. Om du inte ser starthanterarprompten vid\n"
 " omstart, h�ll ner Command-Option-O-F under uppstart och skriv:\n"
-" setenv boot-device $of_boot,\\\\:tbxi\n"
+" setenv boot-device %s,\\\\:tbxi\n"
 " Skriv sedan: shut-down\n"
-"Vid n�sta uppstart b�r du se bootladdarprompten"
+"Vid n�sta uppstart b�r du se starthanterarprompten."
 
-#: ../../install_steps_interactive.pm_.c:1038 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "L�g"
 
-#: ../../install_steps_interactive.pm_.c:1039 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Mellan"
 
-#: ../../install_steps_interactive.pm_.c:1040 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "H�g"
 
-#: ../../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 "V�lj s�kerhetsniv�"
 
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"Vill du skapa en autoinstallationsdiskett f�r att g�ra fler exakt likadana "
-"installationer av Linux-Mandrake?"
-
-#: ../../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�tt in en tom diskett i diskettenhet %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 "Skapar autoinstallationsdiskett"
+msgstr "Skapar automatisk installationsdiskett"
 
-#: ../../install_steps_interactive.pm_.c:1156
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5334,31 +5206,31 @@ msgstr ""
 "\n"
 "Vill du verkligen avbryta nu?"
 
-#: ../../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 ""
 "Gratulerar, installationen �r f�rdig!\n"
-"Tag ur diskett och/eller CD-skiva och tryck p� Enter f�r omstart.\n"
+"Ta ur diskett och/eller CD-skiva och tryck p� Enter f�r omstart.\n"
 "\n"
-"F�r information om uppdateringar bes�k http://www.linux-mandrake.com/.\n"
+"F�r information om uppdateringar bes�k http://www.mandrakelinux.com/.\n"
 "\n"
-"Se kapitlet 'post install' i 'Official Linux-Mandrake User's Guide' f�r "
-"ytterligare information."
+"Se kapitlet \"post install\" i \"Official Mandrake Linux User's Guide\"\n"
+"f�r ytterligare information."
 
-#: ../../install_steps_interactive.pm_.c:1179
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
-msgstr "Genererar autoinstallationsdiskett"
+msgstr "Genererar automatisk installationsdiskett"
 
-#: ../../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"
@@ -5366,56 +5238,72 @@ msgid ""
 "\n"
 "You may prefer to replay the installation.\n"
 msgstr ""
-"Autoinstallation kan g�ras helt automatisk, om s� �nskas,\n"
+"Automatisk installation kan g�ras helt automatisk, om s� �nskas,\n"
 "vilket g�r att den tar �ver h�rddisken!\n"
 "(syftet �r att installera p� en annan dator).\n"
 "\n"
 "Du kan t�nkas vilja k�ra samma installation i repris.\n"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "Automatiserad"
 
-#: ../../install_steps_interactive.pm_.c:1186
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "Repris"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "Spara paketval"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake installation %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux installation %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> mellan element    | <Space> v�ljer  | <F12> n�sta sk�rm "
 
-#: ../../interactive.pm_.c:65
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "kdesu saknas"
 
-#: ../../interactive.pm_.c:267
+#: ../../interactive.pm_.c:132
+msgid "Choose a file"
+msgstr "V�lj en fil"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Avancerad"
 
-#: ../../interactive.pm_.c:290
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "Var god v�nta"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "Expandera tr�d"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "Komprimera tr�d"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "Byt mellan rak och gruppvis sortering"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
-msgstr "Tvetydighet (%s), var mer exakt\n"
+msgstr "Tvetydighet (%s), var mer exakt.\n"
 
 #: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
 #: ../../interactive_stdio.pm_.c:71
 msgid "Bad choice, try again\n"
-msgstr "Fel val, f�rs�k igen\n"
+msgstr "Fel val, f�rs�k igen.\n"
 
 #: ../../interactive_stdio.pm_.c:39
 #, c-format
@@ -5430,284 +5318,301 @@ msgstr "Ditt val? (standard %s)"
 #: ../../interactive_stdio.pm_.c:72
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
-msgstr "Ditt val? (standard %s. Tryck 'ingen' f�r ingen alls.)"
+msgstr "Ditt val? (standard %s, ange \"none\" f�r ingen alls.) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "Tjeckiskt (QWERTZ)"
 
 # Noteraatt de tidigare namnen, med a p� slutet (t.ex. svenska) angav
 # plural. Men vad jag vet anges alltid tangentbordslaouter i singular
 # (Svenskt tangentbord, inte svenska tangentbord).
-#: ../../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 "Tyskt"
 
 # Noteraatt de tidigare namnen, med a p� slutet (t.ex. svenska) angav
 # plural. Men vad jag vet anges alltid tangentbordslaouter i singular
 # (Svenskt tangentbord, inte svenska tangentbord).
-#: ../../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 "Spanskt"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "Finskt"
 
-#: ../../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 "Franskt"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:146 ../../keyboard.pm_.c:211
 msgid "Norwegian"
 msgstr "Norskt"
 
-#: ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:147
 msgid "Polish"
 msgstr "Polskt"
 
-#: ../../keyboard.pm_.c:132 ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "Ryskt"
 
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "Svenskt"
+
 # Noteraatt de tidigare namnen, med a p� slutet (t.ex. svenska) angav
 # plural. Men vad jag vet anges alltid tangentbordslaouter i singular
 # (Svenskt tangentbord, inte svenska tangentbord).
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "Engelskt (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 "Engelskt (US)"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+msgid "Albanian"
+msgstr "Albanskt"
+
+#: ../../keyboard.pm_.c:160
 msgid "Armenian (old)"
 msgstr "Armeniskt (gammal)"
 
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:161
 msgid "Armenian (typewriter)"
 msgstr "Armenskt (typewriter)"
 
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:162
 msgid "Armenian (phonetic)"
 msgstr "Armeniskt (fonetiskt)"
 
-#: ../../keyboard.pm_.c:147
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latin)"
 
-#: ../../keyboard.pm_.c:148
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaidjani (cyrillic)"
-
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "Belgiskt"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "Bulgariskt"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazilianskt"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Vitryskt"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "Schweiziskt (Tysk upps�ttning)"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "Schweiziskt (Fransk upps�ttning)"
 
 # Noteraatt de tidigare namnen, med a p� slutet (t.ex. svenska) angav
 # plural. Men vad jag vet anges alltid tangentbordslaouter i singular
 # (Svenskt tangentbord, inte svenska tangentbord).
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "Tjeckiskt (QWERTY)"
 
-#: ../../keyboard.pm_.c:157
-msgid "Czech (Programmers)"
-msgstr "Tjeckiskt (programmerare)"
-
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "Tyskt (Inga d�da tangenter)"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "Danskt"
 
-#: ../../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 (Norskt)"
 
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estniskt"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "Georgiskt (\"Rysk\" upps�ttning)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Georgiskt (\"Latinsk\" upps�ttning)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "Grekiskt"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "Ungerskt"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Kroatiskt"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "Israeliskt"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "Islaeliskt (Fonetiskt)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iranskt"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "Isl�ndskt"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "Italienskt"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japanskt 106 tangenter"
 
 # Noteraatt de tidigare namnen, med a p� slutet (t.ex. svenska) angav
 # plural. Men vad jag vet anges alltid tangentbordslaouter i singular
 # (Svenskt tangentbord, inte svenska tangentbord).
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Koreanskt"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "Latinamerikanskt"
 
-#: ../../keyboard.pm_.c:180
-msgid "Macedonian"
-msgstr "Makedoniskt"
-
-#: ../../keyboard.pm_.c:181
-msgid "Dutch"
-msgstr "Holl�ndskt"
-
-#: ../../keyboard.pm_.c:182
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Litauiskt AZERTY (gamalt)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Litauiskt AZERTY (nytt)"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Litauiskt \"number row\" QWERTY"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Litauiskt \"phonetic\" QWERTY"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:208
+msgid "Latvian"
+msgstr "Lettisk"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Makedoniskt"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "Holl�ndskt"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Polskt (querty-layout)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Polskt (qwertz-layout)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "Portugisiskt"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "Kanadensiskt"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:217
+msgid "Romanian (qwertz)"
+msgstr "Rum�nskt (qwertz)"
+
+#: ../../keyboard.pm_.c:218
+msgid "Romanian (qwerty)"
+msgstr "Rum�nskt (qwerty)"
+
+#: ../../keyboard.pm_.c:220
 msgid "Russian (Yawerty)"
 msgstr "Ryskt (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
-msgid "Swedish"
-msgstr "Svenskt"
-
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "Slovenskt"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovakiskt (QWERTZ)"
 
-#: ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "Slovakiskt (QWERTY)"
 
-#: ../../keyboard.pm_.c:198
-msgid "Slovakian (Programmers)"
-msgstr "Slovakiskt (programmerare)"
+#: ../../keyboard.pm_.c:229
+msgid "Serbian (cyrillic)"
+msgstr "Serbiskt (cyrillic)"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "Thail�ndskt"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:232
+msgid "Tajik keyboard"
+msgstr "Tajik"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
-msgstr "Turkiskt (traditional \"F\" model)"
+msgstr "Turkiskt (traditionell \"F\"-modell)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
-msgstr "Turkisk (modern \"Q\" model)"
+msgstr "Turkisk (modern \"Q\"-modell)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "Ukrainskt"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
-msgstr "Engelskt (US Internationellt)"
+msgstr "Amerikanskt (internationellt)"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Litauiskt \"nummerisk rad\" QWERTY"
 
-#: ../../keyboard.pm_.c:207
-msgid "Yugoslavian (latin/cyrillic)"
-msgstr "Jugoslaviskt (latinsk/cyrillisk)"
+#: ../../keyboard.pm_.c:240
+msgid "Yugoslavian (latin)"
+msgstr "Jugoslaviskt (latinsk)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Cirkul�ra monteringar %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "Ta bort de logiska enheterna f�rst\n"
 
@@ -5819,170 +5724,222 @@ msgstr "ingen"
 msgid "No mouse"
 msgstr "Ingen mus"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../mouse.pm_.c:482
+msgid "Please test the mouse"
+msgstr "Testa musen"
+
+#: ../../mouse.pm_.c:483
+msgid "To activate the mouse,"
+msgstr "F�r att aktivera musen,"
+
+#: ../../mouse.pm_.c:484
+msgid "MOVE YOUR WHEEL!"
+msgstr "SNURRA P� HJULET!"
+
+#: ../../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 "Slutf�r"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "N�sta ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- F�reg�ende"
 
-#: ../../my_gtk.pm_.c:617
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "�r detta korrekt?"
 
-#: ../../netconnect.pm_.c:143
-msgid "Internet configuration"
-msgstr "Internetkonfiguration"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Anslut till Internet"
 
-#: ../../netconnect.pm_.c:144
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Vill du ansluta till Internet nu?"
+#: ../../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 ""
+"Det vanligaste s�ttet att koppla upp med adsl �r pppoe.\n"
+"En del anslutningar anv�nder pptp och n�gra f� anv�nder dhcp.\n"
+"Om du �r os�ker, v�lj \"pppoe\"."
 
-#: ../../netconnect.pm_.c:148
-msgid "Testing your connection..."
-msgstr "Testar din anslutning..."
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
+msgstr "Alcatel Speedtouch usb"
 
-#: ../../netconnect.pm_.c:154 ../../standalone/draknet_.c:196
-msgid "The system is now connected to Internet."
-msgstr "Systemet �r nu anslutet till Internet."
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "anv�nd dhcp"
 
-#: ../../netconnect.pm_.c:155
-msgid "For Security reason, it will be disconnected now."
-msgstr "Av s�kerhetssk�l kommer den att kopplas ner nu."
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "anv�nd pppoe"
 
-#: ../../netconnect.pm_.c:156 ../../standalone/draknet_.c:196
+#: ../../network/adsl.pm_.c:22
+msgid "use pptp"
+msgstr "anv�nd 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 ""
-"Systemet verkar inte vara anslutet till Internet.\n"
-"Prova att omkonfigurera din anslutning."
-
-#: ../../netconnect.pm_.c:161 ../../netconnect.pm_.c:904
-#: ../../netconnect.pm_.c:934 ../../netconnect.pm_.c:1012
-msgid "Network Configuration"
-msgstr "Konfigurera n�tverk"
-
-#: ../../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-konfiguration"
+"Vilken dhcp-klient vill du anv�nda?\n"
+"Standardalternativet �r 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 ""
-"V�lj din leverant�r.\n"
-" Om den saknas i listan, v�lj Unlisted"
+"Ingen ethernet-n�tverkkort har hittats i ditt system.\n"
+"Jag kan inte installera denna n�tverkstyp."
 
-#: ../../netconnect.pm_.c:236
-msgid "Connection Configuration"
-msgstr "Anslutningskonfiguration"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "V�lj n�tverksgr�nssnitt"
 
-#: ../../netconnect.pm_.c:237
-msgid "Please fill or check the field below"
-msgstr "Var v�nlig fyll i, eller kontrollera, f�ltet nedan"
+#: ../../network/ethernet.pm_.c:93
+msgid ""
+"Please choose which network adapter you want to use to connect to Internet"
+msgstr "V�lj vilken n�tverkskort du vill anv�nda f�r anslutning till Internet"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IRQ"
-msgstr "Kortets IRQ"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "inget n�tverkskort kunde hittas"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card mem (DMA)"
-msgstr "Kortets minne (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "Konfigurera n�tverket"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO"
-msgstr "Kortets 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 ""
+"Ange ditt datornamn om du vet det.\n"
+"En del DHCP-servrar kr�ver att din dator har ett namn f�r att fungera.\n"
+"Ditt datornamn ska skrivas inklusive dom�nnamn,\n"
+"t ex som \"mindator.mittlab.mittforetag.se\"."
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Card IO_0"
-msgstr "Kortets IO_0"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "V�rddatornamn"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Card IO_1"
-msgstr "Kortets 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 "Guiden f�r n�tverkskonfiguration"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Your personal phone number"
-msgstr "Ditt personliga telefonnummer"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "Externt ISDN-modem"
 
-#: ../../netconnect.pm_.c:245 ../../standalone/draknet_.c:558
-msgid "Provider name (ex provider.net)"
-msgstr "Leverant�rens namn (t.ex. leverantor.se)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Internt ISDN-kort"
 
-#: ../../netconnect.pm_.c:246 ../../standalone/draknet_.c:559
-msgid "Provider phone number"
-msgstr "Leverant�rens telefonnummer"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "Vad f�r slags ISDN-anslutning har du?"
 
-#: ../../netconnect.pm_.c:247
-msgid "Provider dns 1"
-msgstr "Leverant�rens 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 ""
+"Vilken ISDN-konfiguration f�redrar du?\n"
+"\n"
+"* Den �ldre varianten anv�nder isdn4net. Den har kraftfulla verktyg,\n"
+"  men �r sv�r att konfigurera f�r nyb�rjare och �r inte standard.\n"
+"\n"
+"* Den nya varianten �r l�ttare att f�rst�, mer standard, men har\n"
+"  f�rre verktyg.\n"
+"\n"
+"Vi rekommenderar isdn-light.\n"
 
-#: ../../netconnect.pm_.c:248
-msgid "Provider dns 2"
-msgstr "Leverant�rens dns 2"
+#: ../../network/isdn.pm_.c:54
+msgid "New configuration (isdn-light)"
+msgstr "Ny konfiguration (isdn-light)"
 
-#: ../../netconnect.pm_.c:249 ../../standalone/draknet_.c:564
-msgid "Dialing mode"
-msgstr "Uppringningsmetod"
+#: ../../network/isdn.pm_.c:54
+msgid "Old configuration (isdn4net)"
+msgstr "�ldre konfiguration (isdn4net)"
 
-#: ../../netconnect.pm_.c:250 ../../standalone/draknet_.c:562
-msgid "Account Login (user name)"
-msgstr "Kontoinloggning (anv�ndarnamn)"
+#: ../../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-konfiguration"
 
-#: ../../netconnect.pm_.c:251 ../../standalone/draknet_.c:563
-msgid "Account Password"
-msgstr "Kontol�senord"
+#: ../../network/isdn.pm_.c:169
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+"V�lj din leverant�r.\n"
+" Om den saknas i listan, v�lj \"Unlisted\""
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol"
+msgstr "Protokoll f�r Europa"
 
-#: ../../netconnect.pm_.c:261
-msgid "Europe (EDSS1)"
-msgstr "Europa (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol (EDSS1)"
+msgstr "Protokoll f�r Europa (EDSS1)"
 
-#: ../../netconnect.pm_.c:263
-msgid "Rest of the world"
-msgstr "Resten av v�rlden"
+#: ../../network/isdn.pm_.c:184
+msgid "Protocol for the rest of the world"
+msgstr "Protokoll f�r resten av v�rlden"
 
-#: ../../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 ""
-"Resten av v�rlden \n"
-" ingen D-kanal (hyrda linor)"
+"Protokoll f�r resten av v�rlden \n"
+" ingen D-kanal (hyrd lina)"
 
-#: ../../netconnect.pm_.c:267
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Vilket protokoll vill du anv�nda?"
 
-#: ../../netconnect.pm_.c:277
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Vilket typ av kort har du?"
 
-#: ../../netconnect.pm_.c:278
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Vet ej"
 
-#: ../../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"
@@ -5994,128 +5951,79 @@ msgstr ""
 "\n"
 "Om du har ett PCMCIA-kort m�ste du veta IRQ och IO f�r ditt kort.\n"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Avbryt"
 
-#: ../../netconnect.pm_.c:288
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
-msgstr "Forts�tta"
+msgstr "Forts�tt"
 
-#: ../../netconnect.pm_.c:294
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Vilket �r ditt ISDN-kort?"
 
-#: ../../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 ""
-"Jag har detekterat ett ISDN PCI-kort, men k�nner inte till modellen. Var "
-"v�nlig v�lj ett av PCI-korten p� n�sta sk�rm."
+"Jag har hittat ett ISDN PCI-kort, men k�nner inte till modellen. V�lj ett av "
+"PCI-korten p� n�sta sk�rm."
 
-#: ../../netconnect.pm_.c:323
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
-msgstr "Inget ISDN PCI-kort funnet. Var v�nlig v�lj ett p� n�sta sk�rm."
-
-#: ../../netconnect.pm_.c:371
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Ingen ethernet n�tverksadapter har uppt�ckts i ditt system.\n"
-"Jag kan inte installera denna n�tverkstyp."
-
-#: ../../netconnect.pm_.c:375 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "V�lj n�tverks-interface"
-
-#: ../../netconnect.pm_.c:376
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr ""
-"Var v�nlig v�lj vilken n�tverksadapter du vill anv�nda f�r anslutning till "
-"Internet"
+msgstr "Inget ISDN PCI-kort hittat. V�lj ett p� n�sta sk�rm."
 
-#: ../../netconnect.pm_.c:385 ../../netconnect.pm_.c:700
-#: ../../netconnect.pm_.c:845 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "N�tverks-interface"
-
-#: ../../netconnect.pm_.c:386
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"Ok?"
-
-#: ../../netconnect.pm_.c:386
-msgid "I'm about to restart the network device:\n"
-msgstr "Jag �r p� v�g att starta om n�tverksenhet:\n"
-
-#: ../../netconnect.pm_.c:484
-msgid "ADSL configuration"
-msgstr "ADSL-konfiguration"
-
-#: ../../netconnect.pm_.c:485
-msgid "Do you want to start your connection at boot?"
-msgstr "Vill du starta din anslutning vid uppstart?"
-
-#: ../../netconnect.pm_.c:620
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
-msgstr "Var god ange vilken serieport ditt modem �r anslutet till:"
+msgstr "Ange vilken serieport ditt modem �r anslutet till:"
 
-#: ../../netconnect.pm_.c:625
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Uppringningsalternativ"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "Namn p� anslutningen"
 
-#: ../../netconnect.pm_.c:627 ../../standalone/draknet_.c:567
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "Anv�ndar-ID"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
-msgid "Authentication"
-msgstr "Autensiering"
+#: ../../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 "Skriptbaserad"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "Terminalbaserad"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "Dom�nnamn"
 
-#: ../../netconnect.pm_.c:632 ../../standalone/draknet_.c:572
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
-msgstr "Prim�r DNS-server (valfritt)"
+msgstr "Prim�r DNS-server (frivilligt)"
 
-#: ../../netconnect.pm_.c:633 ../../standalone/draknet_.c:573
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
-msgstr "Sekund�r DNS-server (valfritt)"
-
-#: ../../netconnect.pm_.c:701
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr "Jag t�nker starta om n�tverksenhet $netc->{NET_DEVICE}. Ok?"
+msgstr "Sekund�r DNS-server (frivilligt)"
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6123,122 +6031,76 @@ msgstr ""
 "\n"
 "Du kan koppla ifr�n eller konfigurera om din anslutning."
 
-#: ../../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"
-"Du kan omkonfigurera din anslutning."
+"Du kan konfigurera om din anslutning."
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "Du �r f�r n�rvarande ansluten till Internet."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
 msgstr ""
 "\n"
-"Du kan koppla upp mot Internet eller omkonfigurera din anslutning."
+"Du kan koppla upp mot Internet eller konfigurera om din anslutning."
 
-#: ../../netconnect.pm_.c:748
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "Du �r inte ansluten till Internet f�r n�rvarande."
 
-#: ../../netconnect.pm_.c:752 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "Koppla upp mot Internet"
 
-#: ../../netconnect.pm_.c:754
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "Koppla ner fr�n Internet"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Konfigurera n�tverkskopplingen (LAN eller Internet)"
 
-#: ../../netconnect.pm_.c:759
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "Internetanslutning & konfiguration"
 
-#: ../../netconnect.pm_.c:811 ../../netconnect.pm_.c:961
-#: ../../netconnect.pm_.c:971 ../../netconnect.pm_.c:986
-msgid "Network Configuration Wizard"
-msgstr "Guiden f�r n�tverkskonfiguration"
-
-#: ../../netconnect.pm_.c:812
-msgid "External ISDN modem"
-msgstr "Externt ISDN-modem"
-
-#: ../../netconnect.pm_.c:812
-msgid "Internal ISDN card"
-msgstr "Inernt ISDN-kort"
-
-#: ../../netconnect.pm_.c:812
-msgid "What kind is your ISDN connection?"
-msgstr "Vad f�r slags ISDN-anslutning har du?"
-
-#: ../../netconnect.pm_.c:833 ../../netconnect.pm_.c:882
-msgid "Connect to the Internet"
-msgstr "Koppla upp mot 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 ""
-"Det vanligaste s�ttet att koppla upp med adsl �r pppoe.\n"
-"En del anslutningar anv�nder pptp och f� anv�nder dhcp.\n"
-"Om du inte �r s�ker, v�lj 'pppoe'"
-
-#: ../../netconnect.pm_.c:836
-msgid "use dhcp"
-msgstr "anv�nd dhcp"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pppoe"
-msgstr "anv�nd pppoe"
-
-#: ../../netconnect.pm_.c:836
-msgid "use pptp"
-msgstr "anv�nd 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 "Jag �r p� v�g att starta om n�tverksenhet %s. Ok?"
-
-#: ../../netconnect.pm_.c:883
-msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
-msgstr ""
-"Vilken dhcp-klient vill du anv�nda?\n"
-"Standardalternativet �r dhcpcd."
-
-#: ../../netconnect.pm_.c:900
-msgid "Network configuration"
-msgstr "N�tverkskonfiguration"
-
-#: ../../netconnect.pm_.c:901
-msgid "Do you want to restart the network"
-msgstr "Vill du starta om n�tverket?"
+msgid "We are now going to configure the %s connection."
+msgstr "Vi kommer nu att anpassa anslutning %s."
 
-#: ../../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 ""
-"Ett fel uppstod n�r n�tverket skulle startas om: \n"
 "\n"
-"%s"
+"\n"
+"\n"
+"Vi kommer nu att konfigurera anslutning %s.\n"
+"\n"
+"\n"
+"Klicka \"OK\" f�r att b�rja."
 
-#: ../../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 "Konfigurera n�tverk"
+
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6247,118 +6109,135 @@ msgid ""
 msgstr ""
 "Eftersom du g�r en n�tverksinstallation �r ditt n�tverk redan konfigurerat.\n"
 "Klicka p� Ok f�r att beh�lla din konfiguration, eller avbryt f�r att "
-"omkonfigurera din Internet & n�tverksanslutning.\n"
+"konfigurera om din Internet- & n�tverksanslutning.\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 ""
-"V�lkommen till guiden f�r n�tverksinstallation\n"
+"V�lkommen till guiden f�r n�tverksinstallation.\n"
 "\n"
 "Vi kommer att konfigurera din Internet/n�tverksanslutning.\n"
-"Om du inte vill anv�nda autodetekteringen, klicka bort markeringen.\n"
+"Om du inte vill anv�nda hitta automatiskt, klicka bort markeringen.\n"
 
-#: ../../netconnect.pm_.c:964
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "V�lj profil att konfigurera"
 
-#: ../../netconnect.pm_.c:965
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
-msgstr "Anv�nd autodetektering"
+msgstr "Anv�nd hitta automatiskt"
 
-#: ../../netconnect.pm_.c:971 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "Letar efter enheter..."
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "Normal modemuppkoppling"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
-msgstr "detekterad p� port %s"
+msgstr "hittad p� port %s"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "ISDN-uppkoppling"
 
-#: ../../netconnect.pm_.c:979
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
-msgstr "detekterade %s"
+msgstr "hittade %s"
 
-#: ../../netconnect.pm_.c:980
-msgid "DSL (or ADSL) connection"
-msgstr "DSL (eller ADSL)"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+msgid "ADSL connection"
+msgstr "ADSL-anslutning"
 
-#: ../../netconnect.pm_.c:980
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
-msgstr "detekterad p� interface %s"
+msgstr "hittad p� gr�nssnitt %s"
 
-#: ../../netconnect.pm_.c:981
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "Anslutning med kabelmodem"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+msgid "cable connection detected"
+msgstr "kabel-anslutning har hittats"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "LAN-anslutning"
 
-#: ../../netconnect.pm_.c:982
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
-msgstr "ethernet kort detekterade"
+msgstr "ethernet-kort har hittats"
 
-#: ../../netconnect.pm_.c:987
-msgid "How do you want to connect to the Internet?"
-msgstr "Hur vill du koppla upp mot Internet?"
+#: ../../network/netconnect.pm_.c:190
+msgid "Choose the connection you want to configure"
+msgstr "V�lj den anslutning du vill konfigurera"
 
-#: ../../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 ""
-"Gratulerar, n�tverks- och Internetkonfigurationen �r klar.\n"
+"Du har konfigurerat flera s�tt att ansluta till Internet.\n"
+"V�lj den du vill anv�nda.\n"
 "\n"
-"Konfigurationen kommer nu att l�ggas in i ditt system."
 
-#: ../../netconnect.pm_.c:1007
-msgid ""
-"After that is done, we recommend you to restart your X\n"
-"environnement to avoid hostname changing problem."
-msgstr ""
-"N�r det �r klart rekommenderar vi att du startar om din X-milj�\n"
-"f�r att undvika problem vid byte av v�rdnamn."
+#: ../../network/netconnect.pm_.c:215
+msgid "Internet connection"
+msgstr "Internet-anslutning"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "inget n�tverkskort kunde hittas"
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "Vill du starta din anslutning vid uppstart?"
 
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "Konfigurera n�tverket"
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "N�tverkskonfiguration"
+
+#: ../../network/netconnect.pm_.c:240
+msgid "The network needs to be restarted"
+msgstr "N�tverket m�ste startas om"
 
-#: ../../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 ""
-"Var god skriv in ditt datornamn om du vet det.\n"
-"En del DHCP-servrar kr�ver att din dator har ett namn f�r att fungera.\n"
-"Ditt datornamn skall skrivas inklusive dom�nnamn,\n"
-"t.ex. som \"mindator.mittlab.mittforetag.se\"."
+"Ett fel uppstod n�r n�tverket skulle startas om: \n"
+"\n"
+"%s"
 
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "V�rdnamn"
+#: ../../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 ""
+"Gratulerar, n�tverks- och Internetkonfigurationen �r klar.\n"
+"\n"
+"Konfigurationen kommer nu att l�ggas in i ditt system.\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 ""
+"N�r det �r klart rekommenderas du att starta om din X-milj�\n"
+"f�r att undvika problem vid byte av v�rddatornamn."
+
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -6370,47 +6249,48 @@ msgstr ""
 "Genom att acceptera beh�ller den sin konfiguration.\n"
 "Modifiering av f�lten nedan �sidos�tter denna konfiguration."
 
-#: ../../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 ""
-"Skriv in IP-konfigurationen f�r den h�r datorn. Varje adress skall skrivas "
-"som en s.k. dotted-quad (t.ex. 1.2.3.4)."
+"Skriv in IP-konfigurationen f�r den h�r datorn.\n"
+"Varje adress skall skrivas som en s� kallad\n"
+"dotted-quad (t.ex. 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 "Konfigurera n�tverksenhet %s"
 
-#: ../../network.pm_.c:334
-msgid " (driver $module)"
-msgstr "(drivrutin $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (drivrutin %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-adress"
 
-#: ../../network.pm_.c:337 ../../standalone/draknet_.c:428
+#: ../../network/network.pm_.c:301 ../../standalone/draknet_.c:462
 msgid "Netmask"
 msgstr "N�tmask"
 
-#: ../../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 "Dynamisk 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-adressen ska vara i formatet 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"
@@ -6418,47 +6298,152 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one"
 msgstr ""
 "Skriv in dom�nnamn och datornamn.\n"
-"Datornamnet skall vara ett fullt datornamn, t ex \"mindator.mindoman.se\".Du "
-"kan ox� ange IP-adressen till en gateway om du har en s�dan. Om du inte har "
-"n�gon gateway, l�mna dessa f�lt tomma."
+"Datornamnet skall vara ett fulltst�ndigt datornamn,\n"
+"t ex \"mindator.mindoman.se\".Du kan ocks� ange IP-adressen\n"
+"till en gateway om du har en s�dan. Om du inte har n�gon gateway,\n"
+"l�mna dessa f�lt tomma."
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "DNS-server"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:565
+#: ../../network/network.pm_.c:357 ../../standalone/draknet_.c:599
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../../network.pm_.c:396
+#: ../../network/network.pm_.c:359
 msgid "Gateway device"
 msgstr "Gateway-enhet"
 
-#: ../../network.pm_.c:407
+#: ../../network/network.pm_.c:371
 msgid "Proxies configuration"
 msgstr "Proxy-konfiguration"
 
-#: ../../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 "Sp�ra n�tverkskortets id (anv�ndbart f�r b�rbara datorer)"
+
+#: ../../network/network.pm_.c:377
 msgid "Proxy should be http://..."
 msgstr "Proxy ska vara http://..."
 
-#: ../../network.pm_.c:413
+#: ../../network/network.pm_.c:378
 msgid "Proxy should be ftp://..."
 msgstr "Proxy ska vara ftp://..."
 
-#: ../../partition_table.pm_.c:563
+#: ../../network/tools.pm_.c:38
+msgid "Internet configuration"
+msgstr "Internetkonfiguration"
+
+#: ../../network/tools.pm_.c:39
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Vill du ansluta till Internet nu?"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "Testar din anslutning..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "Systemet �r nu anslutet till Internet."
+
+#: ../../network/tools.pm_.c:50
+msgid "For Security reason, it will be disconnected now."
+msgstr "Av s�kerhetssk�l kommer den att kopplas ner nu."
+
+#: ../../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 ""
+"Systemet verkar inte vara anslutet till Internet.\n"
+"Prova att konfigurera om din anslutning."
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "Anslutningskonfiguration"
+
+#: ../../network/tools.pm_.c:76
+msgid "Please fill or check the field below"
+msgstr "Fyll i, eller kontrollera, f�ltet nedan"
+
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:586
+msgid "Card IRQ"
+msgstr "Kortets IRQ"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Kortets minne (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "Kortets IO"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "Kortets IO_0"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "Kortets IO_1"
+
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:591
+msgid "Your personal phone number"
+msgstr "Ditt personliga telefonnummer"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:592
+msgid "Provider name (ex provider.net)"
+msgstr "Leverant�rens namn (t ex leverantor.se)"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:593
+msgid "Provider phone number"
+msgstr "Leverant�rens telefonnummer"
+
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:594
+msgid "Provider dns 1 (optional)"
+msgstr "Leverant�rens dns 1 (frivilligt)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "Leverant�rens dns 2 (frivilligt)"
+
+#: ../../network/tools.pm_.c:88
+msgid "Choose your country"
+msgstr "V�lj ditt land"
+
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:598
+msgid "Dialing mode"
+msgstr "Uppringningsmetod"
+
+#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:610
+msgid "Connection speed"
+msgstr "Anslutningshastighet"
+
+#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:611
+msgid "Connection timeout (in sec)"
+msgstr "Anslutningens tidsgr�ns (i sek)"
+
+#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:596
+msgid "Account Login (user name)"
+msgstr "Kontoinloggning (anv�ndarnamn)"
+
+#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:597
+msgid "Account Password"
+msgstr "Kontol�senord"
+
+#: ../../partition_table.pm_.c:622
 msgid "Extended partition not supported on this platform"
-msgstr "Ut�kade partitioner st�ds inte p� den h�r platformen"
+msgstr "Ut�kade partitioner st�ds inte p� den h�r plattformen."
 
-#: ../../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 "
@@ -6468,26 +6453,21 @@ msgstr ""
 "Den enda l�sningen �r att du flyttar din prim�ra partition,\n"
 "s� att den ligger bredvid den ut�kade partitionen."
 
-#: ../../partition_table.pm_.c:675
-#, c-format
-msgid "Error reading file %s"
-msgstr "Fel vid �ppning av fil %s"
-
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "�terst�llning fr�n fil %s misslyckades: %s"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "Trasig �terst�llningsfil"
 
-#: ../../partition_table.pm_.c:706
+#: ../../partition_table.pm_.c:768
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Kunde inte skriva till fil %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"
@@ -6517,86 +6497,274 @@ msgstr "trevligt"
 msgid "maybe"
 msgstr "tveksamt"
 
-#: ../../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 "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 "Lokal skrivare"
 
-#: ../../printer.pm_.c:21
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "N�tverksskrivare"
 
-#: ../../printer.pm_.c:23
-msgid "Remote lpd server"
-msgstr "Remote lpd-server"
+#: ../../printer.pm_.c:42
+msgid "Printer on remote CUPS server"
+msgstr "Skrivare p� CUPS-fj�rrserver"
 
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:43
+msgid "Printer on remote lpd server"
+msgstr "Skrivare p� lpd-fj�rrserver"
+
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "N�tverksskrivare (socket)"
 
-#: ../../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 "Skrivare p� SMB/Windows-server"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "NetWare"
+#: ../../printer.pm_.c:46
+msgid "Printer on NetWare server"
+msgstr "Skrivare p� Netware-server"
 
-#: ../../printer.pm_.c:27 ../../printerdrake.pm_.c:158
-#: ../../printerdrake.pm_.c:160
-msgid "Printer Device URI"
-msgstr "Skrivarenhetens URI"
+#: ../../printer.pm_.c:47
+msgid "Enter a printer device URI"
+msgstr "Ange URI f�r skrivarenhet"
+
+#: ../../printer.pm_.c:48
+msgid "Pipe job into a command"
+msgstr "Skicka jobbet till kommando"
+
+#: ../../printer.pm_.c:418 ../../printer.pm_.c:839
+#: ../../printerdrake.pm_.c:1227 ../../printerdrake.pm_.c:2023
+msgid "Unknown model"
+msgstr "Ok�nd modell"
+
+#: ../../printer.pm_.c:546 ../../printerdrake.pm_.c:790
+msgid "Raw printer (No driver)"
+msgstr "R� skrivare (ingen drivrutin)"
+
+#: ../../printer.pm_.c:693
+#, c-format
+msgid "(on %s)"
+msgstr "(p� %s)"
+
+#: ../../printer.pm_.c:695
+msgid "(on this machine)"
+msgstr "(p� den h�r maskinen)"
+
+#: ../../printerdrake.pm_.c:22
+msgid "Select Printer Connection"
+msgstr "V�lj skrivaranslutning"
+
+#: ../../printerdrake.pm_.c:23
+msgid "How is the printer connected?"
+msgstr "Hur �r skrivaren ansluten?"
+
+#: ../../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"
+"Skrivare p� CUPS-fj�rrservrar beh�ver du inte konfigurera\n"
+"h�r; de kommer att hittas automatiskt. Om du �nd�\n"
+"vill konfigurera, v�lj \"Skrivare p� CUPS-fj�rrserver\"."
+
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:89 ../../printerdrake.pm_.c:159
+msgid "None"
+msgstr "Ingen"
+
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:160
+msgid "Choose a default printer!"
+msgstr "V�lj en standardskrivare!"
+
+#: ../../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 ""
+"Med en CUPS-fj�rrserver beh�ver du inte konfigurera n�gon \n"
+"skrivare h�r; CUPS-servrar informerar din maskin automatiskt\n"
+"om dess skrivare. Alla skrivare som din maskin k�nner till\n"
+"f�r tillf�llet visas i f�ltet \"Standardskrivare\".\n"
+"V�lj standardskrivaren f�r din maskin d�r och klicka\n"
+"p� knappen \"Verkst�ll/L�s som skrivare\". Klicka p� samma knapp f�r\n"
+"att uppdatera listan (det kan ta upp till 30 sekunder fr�n start av\n"
+"CUPS till alla fj�rrskrivare syns).\n"
+"N�r din CUPS-server �r i ett annat n�tverk, m�ste du \n"
+"fylla i CUPS-servers IP-adress (och om du vill; portnummret),\n"
+"f�r att f� skrivarinformation fr�n servern.\n"
+"L�mna de h�r f�lten tomma annars."
+
+#: ../../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 ""
+"\n"
+"Normalt s�tt s� konfigureras CUPS automatiskt enligt din\n"
+"n�tverksmilj�, s� att du kan komma �t skrivarna p�\n"
+"CUPS-servrarna i ditt lokala n�tverk. Om det h�r inte fungerar, \n"
+"st�ng av \"Automatisk konfiguration av CUPS\" och redigera filen\n"
+"/etc/cups/cupsd.conf manuellt. Gl�m inte att starta om CUPS\n"
+"efter �ndringarna (kommando: \"service cups restart\")."
+
+#: ../../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 "St�ng"
+
+#: ../../printerdrake.pm_.c:125
+msgid "Apply/Re-read printers"
+msgstr "Verkst�ll/l�s om skrivare"
+
+#: ../../printerdrake.pm_.c:129
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP-adressen ska vara i formatet 192.168.1.20"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+msgid "The port number should be an integer!"
+msgstr "Portnumret m�ste vara ett heltal!"
+
+#: ../../printerdrake.pm_.c:141 ../../printerdrake.pm_.c:2095
+msgid "Default printer"
+msgstr "Standardskrivare"
+
+#: ../../printerdrake.pm_.c:146
+msgid "CUPS server IP"
+msgstr "CUPS-serverns IP"
 
-#: ../../printerdrake.pm_.c:19
+#: ../../printerdrake.pm_.c:147 ../../printerdrake.pm_.c:534
+msgid "Port"
+msgstr "Port"
+
+#: ../../printerdrake.pm_.c:149
+msgid "Automatic CUPS configuration"
+msgstr "Automatisk konfiguration av CUPS"
+
+#: ../../printerdrake.pm_.c:217
+msgid "Detecting devices ..."
+msgstr "Letar efter enheter..."
+
+#: ../../printerdrake.pm_.c:217
 msgid "Test ports"
 msgstr "Testar portar"
 
-#: ../../printerdrake.pm_.c:40
+#: ../../printerdrake.pm_.c:238
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "En skrivare, modell \"%s\", har hittats p� "
 
-#: ../../printerdrake.pm_.c:52
+#: ../../printerdrake.pm_.c:255
 msgid "Local Printer Device"
 msgstr "Lokal skrivare"
 
-#: ../../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 ""
 "Vilken enhet �r skrivaren kopplad till?\n"
-"(notera att /dev/lp0 �r samma somLPT1:)\n"
+"(observera att /dev/lp0 �r samma som LPT1:)\n"
 
-#: ../../printerdrake.pm_.c:55
+#: ../../printerdrake.pm_.c:258
 msgid "Printer Device"
 msgstr "Skrivarenhet"
 
-#: ../../printerdrake.pm_.c:74
+#: ../../printerdrake.pm_.c:261
+msgid "Device/file name missing!"
+msgstr "Enhet eller filnamn saknas!"
+
+#: ../../printerdrake.pm_.c:274 ../../printerdrake.pm_.c:698
+#: ../../printerdrake.pm_.c:786
+msgid "Reading printer database ..."
+msgstr "L�ser skrivardatabas..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
-msgstr "Inst�llningar f�r lpd:"
+msgstr "Alternativ f�r lpd-skrivare"
 
-#: ../../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 ""
-"F�r att anv�nda en lpd skrivark� p� en annan server beh�ver du ange namnet\n"
-"p� den andra servern och k�n d�r jobben skall placeras."
+"F�r att anv�nda en lpd-utskriftsk� m�ste du ange\n"
+"skrivarserverns v�rddatornamn och vad skrivark�n heter\n"
+"p� den servern."
+
+#: ../../printerdrake.pm_.c:316
+msgid "Remote host name"
+msgstr "Fj�rrv�rddatornamn"
+
+#: ../../printerdrake.pm_.c:317
+msgid "Remote printer name"
+msgstr "Fj�rrskrivarnamn"
 
-#: ../../printerdrake.pm_.c:78
-msgid "Remote hostname"
-msgstr "Fj�rrv�rdnamn"
+#: ../../printerdrake.pm_.c:320
+msgid "Remote host name missing!"
+msgstr "Namn p� fj�rrv�rddatorn saknas!"
 
-#: ../../printerdrake.pm_.c:79
-msgid "Remote queue"
-msgstr "Remote k�namn"
+#: ../../printerdrake.pm_.c:324
+msgid "Remote printer name missing!"
+msgstr "Namn p� fj�rrv�rddatorn saknas!"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
-msgstr "SMB (Windows 9x/NT) skrivarinst�llningar"
+msgstr "SMB-skrivarinst�llningar (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"
@@ -6604,354 +6772,990 @@ msgid ""
 "well as the share name for the printer you wish to access and any\n"
 "applicable user name, password, and workgroup information."
 msgstr ""
-"F�r att skriva ut p� en SMB-skrivare ska du uppge SMB-namnet (detta �r inte "
-"alltid samma som DNS-namnet) och om m�jligt IP-adressen till skrivarservern. "
-"�ven delningsnamnet f�r skrivare du vill ha tillg�ng till och anv�ndarnamn "
-"med l�senord."
+"F�r att skriva ut p� en SMB-skrivare ska du uppge SMB-v�rddatornamnet\n"
+"(detta �r inte alltid samma som DNS-namnet) och om m�jligt\n"
+"IP-adressen till skrivarservern. �ven utdelningsnamnet f�r skrivaren\n"
+"du vill ha tillg�ng till och anv�ndarnamn med l�senord."
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
-msgstr "SMB-serverv�rd"
+msgstr "SMB-serverv�rddator"
 
-#: ../../printerdrake.pm_.c:95
+#: ../../printerdrake.pm_.c:399
 msgid "SMB server IP"
 msgstr "SMB-serverns IP-adress"
 
-#: ../../printerdrake.pm_.c:96
+#: ../../printerdrake.pm_.c:400
 msgid "Share name"
-msgstr "Namn p� delad volym"
+msgstr "Namn p� utdelad volym"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "Arbetsgrupp"
 
-#: ../../printerdrake.pm_.c:124
+#: ../../printerdrake.pm_.c:410
+msgid "Either the server name or the server's IP must be given!"
+msgstr "Du m�ste ange antingen serverns namn eller serverns IP-nummer!"
+
+#: ../../printerdrake.pm_.c:414
+msgid "Samba share name missing!"
+msgstr "Namn p� Samba-utdelning saknas!"
+
+#: ../../printerdrake.pm_.c:473
 msgid "NetWare Printer Options"
-msgstr "NetWare skrivarinst�llningar"
+msgstr "Skrivarinst�llningar f�r 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."
 msgstr ""
-"F�r att skriva ut p� en NetWare-skrivare ska du uppge NetWare-skrivarnamnet "
-"(detta �r inte alltid samma som DNS-namnet) s�v�l som namnet till printk�n\n"
-"f�r den skrivare du vill ha tillg�ng till. Du m�ste �ven uppge eventuella\n"
-"anv�ndarnamn med l�senord."
+"F�r att skriva ut p� en Netware-skrivare ska du uppge\n"
+"Netware-skrivarnamnet (detta �r inte alltid samma som DNS-namnet)\n"
+"s�v�l som namnet till skrivark�n f�r den skrivare du vill ha\n"
+"tillg�ng till. Du m�ste �ven uppge eventuella anv�ndarnamn med l�senord."
 
-#: ../../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:478
 msgid "Printer Server"
 msgstr "Skrivarserver"
 
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:479
 msgid "Print Queue Name"
 msgstr "Skrivark�namn"
 
-#: ../../printerdrake.pm_.c:142
+#: ../../printerdrake.pm_.c:484
+msgid "NCP server name missing!"
+msgstr "Namn p� NCP-server saknas!"
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr "Namn p� NCP-k� saknas!"
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "Alternativ f�r socketskrivare"
 
-#: ../../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 ""
 "F�r att skriva till en socket-skrivare beh�ver du ange\n"
-"host-namn f�r skrivaren och ev. ocks� portnummer."
+"v�rddatornamnet f�r skrivaren och eventuellt ocks� portnummret.\n"
+"P� HP JetDirect-servrar �r portnumret vanligtvis 9100, p� andra\n"
+"servrar kan det variera. Se manualen f�r din h�rdvara."
 
-#: ../../printerdrake.pm_.c:145
-msgid "Printer Hostname"
-msgstr "Skrivarv�rdnamn"
+#: ../../printerdrake.pm_.c:533
+msgid "Printer host name"
+msgstr "Skrivarv�rddatornamn"
 
-#: ../../printerdrake.pm_.c:146 ../../printerdrake.pm_.c:422
-msgid "Port"
-msgstr "Port"
+#: ../../printerdrake.pm_.c:537
+msgid "Printer host name missing!"
+msgstr "Namn p� skrivarv�rddatorn saknas!"
+
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:568
+msgid "Printer Device URI"
+msgstr "Skrivarenhetens 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 ""
+"Du kan ange URI f�r att komma �t skrivaren direkt. URI:n m�ste uppfylla "
+"antingen CUPS eller Foomatics specifikationer. Inte alla URI-typer st�ds av "
+"alla utskriftshanterare."
+
+#: ../../printerdrake.pm_.c:582
+msgid "A valid URI must be entered!"
+msgstr "En giltig URI m�ste anges!"
+
+#: ../../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 ""
+"Varje skrivare beh�ver ett namn (exempelvis lp).\n"
+"Beskrivning och plats beh�ver inte fyllas i. De �r\n"
+"kommentarer f�r anv�ndarna."
+
+#: ../../printerdrake.pm_.c:685
+msgid "Name of printer"
+msgstr "Skrivarens namn"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "Beskrivning"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "Placering"
+
+#: ../../printerdrake.pm_.c:701
+msgid "Preparing printer database ..."
+msgstr "F�rbereder skrivardatabas..."
+
+#: ../../printerdrake.pm_.c:793
+msgid "Printer model selection"
+msgstr "Val av skrivarmodell"
+
+#: ../../printerdrake.pm_.c:794
+msgid "Which printer model do you have?"
+msgstr "Vilken skrivarmodell har du?"
+
+#: ../../printerdrake.pm_.c:866
+msgid "OKI winprinter configuration"
+msgstr "Konfiguration av OKI winprinter"
+
+#: ../../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 ""
+"Du konfigurerar en OKI laser winprinter. Dessa skrivare\n"
+"anv�nder ett v�ldigt speciellt kommunikationsprotokoll och\n"
+"fungerar d�rf�r bara n�r de �r anslutna till den f�rsta\n"
+"parallellporten. N�r din skrivare �r ansluten till en annan\n"
+"port eller till en skrivarserver, anslut skrivaren till den\n"
+"f�rsta parallellporten innan du skriver ut en testsida.\n"
+"Annars kommer skrivaren inte att fungera. Dina inst�llningar\n"
+"f�r anslutningstyp kommer att ignoreras av drivrutinen."
+
+#: ../../printerdrake.pm_.c:916 ../../printerdrake.pm_.c:946
+msgid "Lexmark inkjet configuration"
+msgstr "Konfiguration av Lexmark inkjet"
+
+#: ../../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 ""
+"Drivrutinerna f�r inkjet som tillhandah�lls av Lexmark st�djer\n"
+"endast lokala skrivare, inga skrivare p� fj�rrdatorer eller\n"
+"skrivarservrar. Anslut din skrivare till en lokal port eller\n"
+"konfigurera den p� maskinen till vilken den �r ansluten."
+
+#: ../../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 ""
+"Standardinst�llningar f�r skrivare\n"
+"Du b�r se till att sidstorleken och\n"
+"ink-typen (om tillg�nglig) �r inst�llda ordentligt.\n"
+"Observera att med en v�ldigt h�g utskriftskvalitet kan\n"
+"utskrifterna ta l�ngre tid."
+
+#: ../../printerdrake.pm_.c:1090
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr "Alternativet %s m�ste vara ett heltal!"
+
+#: ../../printerdrake.pm_.c:1094
+#, c-format
+msgid "Option %s must be a number!"
+msgstr "Alternativet %s m�ste vara ett nummer!"
+
+#: ../../printerdrake.pm_.c:1099
+#, c-format
+msgid "Option %s out of range!"
+msgstr "Alternativet %s �r utanf�r omr�det!"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "Du kan ange URI direkt f�r att n� skrivaren med CUPS."
+#: ../../printerdrake.pm_.c:1136
+#, c-format
+msgid ""
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
+msgstr ""
+"Vill du anv�nda skrivaren \"%s\"\n"
+"som standardskrivare?"
 
-#: ../../printerdrake.pm_.c:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
-msgstr "Vilken sorts skrivare har du?"
+#: ../../printerdrake.pm_.c:1152
+msgid "Test pages"
+msgstr "Testsidor"
 
-#: ../../printerdrake.pm_.c:204 ../../printerdrake.pm_.c:305
-msgid "Do you want to test printing?"
-msgstr "Vill du skriva ut en testsida?"
+#: ../../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 ""
+"V�lj de testsidor du vill skriva ut.\n"
+"Observera: fototestsidan kan ta ganska l�ng tid att f� utskriven\n"
+"och p� laserskrivare med f�r lite minne g�r det inte alls.\n"
+"I de flesta fall r�cker det med att skriva ut standardtestsidan."
 
-#: ../../printerdrake.pm_.c:207 ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:1158
+msgid "No test pages"
+msgstr "Inga testsidor"
+
+#: ../../printerdrake.pm_.c:1159
+msgid "Print"
+msgstr "Skriv ut"
+
+#: ../../printerdrake.pm_.c:1161
+msgid "Standard test page"
+msgstr "Standardtestsida"
+
+#: ../../printerdrake.pm_.c:1164
+msgid "Alternative test page (Letter)"
+msgstr "Alternativ testsida (Letter)"
+
+#: ../../printerdrake.pm_.c:1167
+msgid "Alternative test page (A4)"
+msgstr "Alternativ testsida (A4)"
+
+#: ../../printerdrake.pm_.c:1169
+msgid "Photo test page"
+msgstr "Fototestsida"
+
+#: ../../printerdrake.pm_.c:1175 ../../printerdrake.pm_.c:1297
 msgid "Printing test page(s)..."
 msgstr "Skriver ut testsida..."
 
-#: ../../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 ""
-"Testsidan(sidorna) har skickats till printer daemonen.\n"
-"Det kan ta en liten stund innan skrivaren startar.\n"
-"Print status:\n"
+"Testsidan har skickats till skrivaren.\n"
+"Det kan ta lite tid innan skrivaren startar.\n"
+"Skrivarens status:\n"
 "%s\n"
 "\n"
-"Fungerar det som det ska?"
 
-#: ../../printerdrake.pm_.c:218 ../../printerdrake.pm_.c:328
+#: ../../printerdrake.pm_.c:1204
+msgid ""
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
+msgstr ""
+"Testsidan har skickats till skrivaren.\n"
+"Det kan ta lite tid innan skrivaren startar.\n"
+
+#: ../../printerdrake.pm_.c:1211
+msgid "Did it work properly?"
+msgstr "Fungerade det?"
+
+#: ../../printerdrake.pm_.c:1229 ../../printerdrake.pm_.c:2025
+msgid "Raw printer"
+msgstr "R� skrivare"
+
+#: ../../printerdrake.pm_.c:1237
+#, c-format
 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?"
+"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 ""
-"Testsidan(sidorna) har skickats till printer daemon.\n"
-"Det kan ta en liten stund innan skrivaren startar.\n"
-"Fungerar det som det ska?"
+"F�r att skriva ut en fil fr�n kommandoraden (terminalf�nster) kan du "
+"antingen anv�nda kommandot \"%s <fil>\" eller ett grafiskt utskriftsverktyg: "
+"\"xpp <fil>\" eller \"qtcups <fil>\". De grafiska verktygen l�ter dig v�lja "
+"skrivare och �ndra alternativinst�llningarna p� ett enkelt s�tt.\n"
 
-#: ../../printerdrake.pm_.c:234
-msgid "Yes, print ASCII test page"
-msgstr "Ja, skriv ut en ASCII testsida"
+#: ../../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 ""
+"Dessa kommandon kan du ocks� anv�nda i f�ltet \"Utskriftskommando\" som "
+"finns i utskriftsdialogrutan hos m�nga program. Ange d� inte filnamnet h�r, "
+"eftersom filen som ska skrivas ut tillhandah�lls av programmet.\n"
 
-#: ../../printerdrake.pm_.c:235
-msgid "Yes, print PostScript test page"
-msgstr "Ja, skriv ut en PostScript testsida"
+#: ../../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 ""
+"\n"
+"Kommandot \"%s\" l�ter dig ocks� �ndra alternativinst�llningarna f�r ett "
+"speciellt utskriftsjobb. L�gg bara till de �nskade inst�llningarna till "
+"kommandoraden, t ex \"%s <fil>\". "
 
-#: ../../printerdrake.pm_.c:236
-msgid "Yes, print both test pages"
-msgstr "Ja, skriv ut b�da sidorna"
+#: ../../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 ""
+"F�r att se en lista p� de tillg�ngliga alternativen f�r den aktuella "
+"skrivaren, l�s antingen listan som visas nedan eller klicka p� knappen "
+"\"Alternativlista f�r utskrift\".\n"
+"\n"
 
-#: ../../printerdrake.pm_.c:243
-msgid "Configure Printer"
-msgstr "Konfigurera skrivare"
+#: ../../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 ""
+"F�r att skriva ut en fil fr�n kommandoraden (terminalf�nster) anv�nd "
+"kommandot \"%s <fil>\".\n"
 
-#: ../../printerdrake.pm_.c:273
-msgid "Printer options"
-msgstr "Skrivarinst�llningar"
+#: ../../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 ""
+"Detta kommando kan du ocks� anv�nda i f�ltet \"Utskriftskommando\" som finns "
+"i utskriftsdialogrutan hos m�nga program. Ange d� inte filnamnet h�r, "
+"eftersom filen som ska skrivas ut tillhandah�lls av programmet.\n"
 
-#: ../../printerdrake.pm_.c:274
-msgid "Paper Size"
-msgstr "Pappersstorlek"
+#: ../../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 ""
+"F�r att se en lista p� de tillg�ngliga alternativen f�r den aktuella "
+"skrivaren, klicka p� knappen \"Alternativlista f�rutskrift\".\n"
+"\n"
 
-#: ../../printerdrake.pm_.c:275
-msgid "Eject page after job?"
-msgstr "Mata ut pappret n�r jobbet �r klart?"
+#: ../../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 ""
+"F�r att skriva ut en fil fr�n kommandoraden (terminalf�nster) anv�nd "
+"kommandot \"%s <fil>\" eller \"%s <fil>\".\n"
 
-#: ../../printerdrake.pm_.c:280
-msgid "Uniprint driver options"
-msgstr "Uniprint skrivarinst�llningar"
+#: ../../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 ""
+"Du kan ocks� anv�nda det grafiska gr�nssnittet \"xpdq\" f�r att st�lla in "
+"olika alternativ och hantera utskrifterna.\n"
+"Om du anv�nder KDE som din skrivbordsmilj� har du en \"panikknapp\", en ikon "
+"p� skrivbordet med namnet \"Stoppa skrivare\". Om du klickar p� den avbryts "
+"omedelbart alla utskrifter. Detta kan vara anv�ndabart om papper har "
+"fastnat.\n"
 
-#: ../../printerdrake.pm_.c:281
-msgid "Color depth options"
-msgstr "Inst�llning av f�rgdjup"
+#: ../../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 ""
+"\n"
+"Kommandona \"%s\" och \"%s\" l�ter dig ocks� �ndra alternativinst�llningarna "
+"f�r ett speciellt utskriftsjobb. L�gg bara till de �nskade inst�llningarna "
+"till kommandoraden, t ex \"%s <fil>\".\n"
 
-#: ../../printerdrake.pm_.c:283
-msgid "Print text as PostScript?"
-msgstr "Skrivut texten som PostScript?"
+#: ../../printerdrake.pm_.c:1292
+#, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "Skriver ut p� skrivare \"%s\""
 
-#: ../../printerdrake.pm_.c:285
-msgid "Fix stair-stepping text?"
-msgstr "R�tta till trappeffekten (stair-stepping)?"
+#: ../../printerdrake.pm_.c:1294
+msgid "Print option list"
+msgstr "Alternativlista f�r utskrift"
 
-#: ../../printerdrake.pm_.c:287
-msgid "Number of pages per output pages"
-msgstr "Antal sidor per utskriven sida"
+#: ../../printerdrake.pm_.c:1318 ../../printerdrake.pm_.c:1741
+#: ../../standalone/printerdrake_.c:48
+msgid "Reading printer data ..."
+msgstr "L�ser skrivardata..."
 
-#: ../../printerdrake.pm_.c:288
-msgid "Right/Left margins in points (1/72 of inch)"
-msgstr "H�ger- och v�nstermarginaler i punkter (1/72 tum)"
+#: ../../printerdrake.pm_.c:1338 ../../printerdrake.pm_.c:1376
+#: ../../printerdrake.pm_.c:1411
+msgid "Transfer printer configuration"
+msgstr "�verf�r skrivarkonfiguration"
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "�verkants- och underkantsmarginaler i punkter (1/72 tum)"
+#: ../../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 ""
+"Du kan kopiera skrivarkonfigurationen som du har gjort \n"
+"f�r spoolern %s till %s, din aktuella spooler. All \n"
+"konfigurationsdata (skrivarnamn, beskrivning, plats, \n"
+"anslutningstyp och standardinst�llningar) flyttas �ver,\n"
+"men jobb �verf�rs inte.\n"
+"Alla k�er kan inte �verf�ras p� grund av f�ljande \n"
+"anledning:\n"
 
-#: ../../printerdrake.pm_.c:291
-msgid "Extra GhostScript options"
-msgstr "Extra GhostScript-parametrar"
+#: ../../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 ""
+"CUPS st�djer inte skrivare p� Novell-servrar eller skrivare\n"
+"som skickar data in till ett \"free-formed\"-kommando.\n"
 
-#: ../../printerdrake.pm_.c:293
-msgid "Extra Text options"
-msgstr "Extra textalternativ"
+#: ../../printerdrake.pm_.c:1350
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
+"PDQ st�djer endast lokala skrivare, LPD-fj�rrskrivare och\n"
+"Socket/TCP-skrivare.\n"
 
-#: ../../printerdrake.pm_.c:295
-msgid "Reverse page order"
-msgstr "Bakv�nd ordning"
+#: ../../printerdrake.pm_.c:1353
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr "LPD och LPRng st�djer inte IPP-skrivare.\n"
 
-#: ../../printerdrake.pm_.c:345
-msgid "Would you like to configure a printer?"
-msgstr "Vill du konfigurera en skrivare?"
+#: ../../printerdrake.pm_.c:1355
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
+"K�er som inte skapats med detta program eller\n"
+"\"foomatic-configure\" kan inte �verf�ras."
 
-#: ../../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 ""
-"H�r �r p�f�ljande skrivark�er.\n"
-"Du kan l�gga till fler eller �ndra p� befintliga."
+"\n"
+"Skrivare konfigurerade med PPD-filerna som tillhandah�lls\n"
+"av tillverkarna eller med de ursprungliga CUPS-drivrutinerna kan\n"
+"inte �verf�ras."
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS startar"
+#: ../../printerdrake.pm_.c:1360
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
+"\n"
+"Markera skrivarna du vill �verf�ra och klicka p� \n"
+"\"�verf�r\"."
 
-#: ../../printerdrake.pm_.c:370
-msgid "Reading CUPS drivers database..."
-msgstr "L�ser CUPS drivrutinsdatabas..."
+#: ../../printerdrake.pm_.c:1363
+msgid "Do not transfer printers"
+msgstr "�verf�r inte skrivare"
 
-#: ../../printerdrake.pm_.c:384 ../../printerdrake.pm_.c:450
-#: ../../printerdrake.pm_.c:471 ../../printerdrake.pm_.c:479
-msgid "Select Printer Connection"
-msgstr "V�lj skrivaranslutning"
+#: ../../printerdrake.pm_.c:1364 ../../printerdrake.pm_.c:1381
+msgid "Transfer"
+msgstr "�verf�r"
 
-#: ../../printerdrake.pm_.c:385 ../../printerdrake.pm_.c:472
-msgid "How is the printer connected?"
-msgstr "Hur �r skrivaren ansluten?"
+#: ../../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 ""
+"En skrivare med namn \"%s\" existerar redan under %s. \n"
+"Klicka p� \"�verf�r\" f�r att skriva �ver den.\n"
+"Du kan ocks� ange ett nytt namn eller hoppa �ver den h�r skrivaren."
 
-#: ../../printerdrake.pm_.c:392
-msgid "Select Remote Printer Connection"
-msgstr "V�lj remote skrivarkoppling"
+#: ../../printerdrake.pm_.c:1385
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
+"Skrivarnamnet f�r bara inneh�lla bokst�ver, siffror och "
+"understrykningsstreck."
 
-#: ../../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 ""
-"Med en remote CUPS-server beh�ver du inte konfigurera\n"
-"n�gon skrivare h�r; skrivare blir automatiskt uppt�ckta.\n"
-"Vid eventuellt tvivel, v�lj \"Remote CUPS-server\"."
+"Skrivaren \"%s\" existerar redan,\n"
+"vill du verkligen skriva �ver dess konfiguration?"
+
+#: ../../printerdrake.pm_.c:1398
+msgid "New printer name"
+msgstr "Nytt skrivarnamn"
+
+#: ../../printerdrake.pm_.c:1401
+#, c-format
+msgid "Transferring %s ..."
+msgstr "�verf�r %s..."
 
-#: ../../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 ""
-"Med en remote CUPS-server beh�ver du inte konfigurera\n"
-"n�gon skrivare h�r; skrivare blir automatiskt uppt�ckta,\n"
-"s�vida du inte har en server p� annat n�tverk; i det\n"
-"fallet m�ste du ange CUPS-serverns IP-adress och ev.\n"
-"ocks� portnumret."
+"Du har �verf�rt din f�rra standardskrivare (\"%s\").\n"
+"Ska den anv�ndas som standardskrivare under det\n"
+"nya skrivarsystemet %s?"
 
-#: ../../printerdrake.pm_.c:421
-msgid "CUPS server IP"
-msgstr "CUPS-serverns IP"
+#: ../../printerdrake.pm_.c:1423
+msgid "Refreshing printer data ..."
+msgstr "Laddar om skrivardata..."
+
+#: ../../printerdrake.pm_.c:1431 ../../printerdrake.pm_.c:1494
+#: ../../printerdrake.pm_.c:1515
+msgid "Configuration of a remote printer"
+msgstr "Konfiguration av en fj�rrskrivare"
+
+#: ../../printerdrake.pm_.c:1432
+msgid "Starting network ..."
+msgstr "Startar n�tverket..."
 
-#: ../../printerdrake.pm_.c:429
-msgid "Port number should be numeric"
-msgstr "Portnumret m�ste best� av siffror"
+#: ../../printerdrake.pm_.c:1454 ../../printerdrake.pm_.c:1462
+#: ../../printerdrake.pm_.c:1464
+msgid "Configure the network now"
+msgstr "Konfigurera n�tverket nu"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "Radera k�"
+#: ../../printerdrake.pm_.c:1455
+msgid "Network functionality not configured"
+msgstr "N�tverksfunktionalitet ej konfigurerad"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1456
 msgid ""
-"Name of printer should contains only letters, numbers and the underscore"
+"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 ""
-"Skrivarnamnet f�r bara inneh�lla bokst�ver, siffror och understrykningsstreck"
+"Du �r p� v�g att konfigurera en fj�rrskrivare. F�r detta\n"
+"kr�vs n�tverks�tkomst, men du har inte konfigurerat ditt\n"
+"n�tverk �nnu. Om du forts�tter utan att konfigurera n�tverket\n"
+"kommer du inte att kunna anv�nda skrivaren som du just\n"
+"nu konfigurerar. Hur vill du forts�tta?"
 
-#: ../../printerdrake.pm_.c:461
+#: ../../printerdrake.pm_.c:1463
+msgid "Go on without configuring the network"
+msgstr "Forts�tt utan att konfigurera n�tverket"
+
+#: ../../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 ""
-"Varje skrivare beh�ver ett namn (t.ex. lp).\n"
-"Andra parametrar, som skrivarens beskrivning eller placering\n"
-"kan definieras. Vilket namn ska anv�ndas f�r denna skrivare och\n"
-"hur �r den kopplad?"
+"N�tverkskonfigurationen som gjordes under installationen \n"
+"kan inte startas nu. Kontrollera om du kommer �t n�tverket\n"
+"efter det att du har startat upp ditt system och korrigera\n"
+"konfigurationen med Mandrakes kontrollcentral, sektionen\n"
+"\"N�tverk & Internet\"/\"Anslutning\". Konfigurera sedan\n"
+"skrivaren med hj�lp av samma kontrollcentral,\n"
+"sektionen \"H�rdvara\"/\"Skrivare\"."
 
-#: ../../printerdrake.pm_.c:465
-msgid "Name of printer"
-msgstr "Skrivarens namn"
+#: ../../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 ""
+"N�tverks�tkomsten var inte ig�ng och kunde inte \n"
+"startas. Kontrollera din konfiguration och din \n"
+"h�rdvara. F�rs�k sedan att konfigurera din\n"
+"fj�rrskrivare igen."
 
-#: ../../printerdrake.pm_.c:466
-msgid "Description"
-msgstr "Beskrivning"
+#: ../../printerdrake.pm_.c:1516
+msgid "Restarting printing system ..."
+msgstr "Startar om skrivarsystem..."
 
-#: ../../printerdrake.pm_.c:467
-msgid "Location"
-msgstr "Placering"
+#: ../../printerdrake.pm_.c:1548
+msgid "high"
+msgstr "h�g"
+
+#: ../../printerdrake.pm_.c:1548
+msgid "paranoid"
+msgstr "paranoid"
+
+#: ../../printerdrake.pm_.c:1549
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr "Installerar ett skrivarsystem i s�kerhetsniv�n %s"
+
+#: ../../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 ""
+"Du �r p� v�g att installera skrivarsystemet %s p�\n"
+"ett system som k�rs i s�kerhetsniv�n %s.\n"
+"\n"
+"Det h�r skrivarsystemet k�rs som en demon (bakgrundsprocess)\n"
+"vilken v�ntar p� skrivarjobb och sedan hanterar dem. Den h�r\n"
+"demonen �r �ven tillg�nglig f�r fj�rrmaskiner via n�tverket\n"
+"och kan d�rmed uts�ttas f�r attacker. D�rf�r startas endast\n"
+"ett f�tal valda demoner som standard i denna s�kerhetsniv�.\n"
+"\n"
+"Vill du verkligen konfigurera utskrift p� den h�r maskinen?"
+
+#: ../../printerdrake.pm_.c:1584
+msgid "Starting the printing system at boot time"
+msgstr "Startar skrivarsystemet vid uppstart"
+
+#: ../../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 ""
+"Skrivarsystemet (%s) kommer inte att startas automatiskt\n"
+"n�r datorn startas upp.\n"
+"\n"
+"Det �r m�jligt att den automatiska starten inaktiverades \n"
+"genom att s�kerhetsniv�n h�jdes, eftersom skrivarsystem\n"
+"�r en svag punkt n�r det g�ller attacker.\n"
+"\n"
+"Vill du att den automatiska starten av skrivarsystemet\n"
+"ska aktiveras igen?"
+
+#: ../../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 "Kontrollerar installerad mjukvara..."
+
+#: ../../printerdrake.pm_.c:1648
+msgid "Removing LPRng..."
+msgstr "Tar bort LPRng..."
+
+#: ../../printerdrake.pm_.c:1675
+msgid "Removing LPD..."
+msgstr "Tar bort LPD..."
+
+#: ../../printerdrake.pm_.c:1727
+msgid "Select Printer Spooler"
+msgstr "V�lj utskriftshanterare"
+
+#: ../../printerdrake.pm_.c:1728
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Vilket utskriftssystem (spooler) vill du anv�nda?"
+
+#: ../../printerdrake.pm_.c:1759
+#, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "Konfigurerar skrivare \"%s\"..."
+
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "Skrivarinst�llningar"
+
+#: ../../printerdrake.pm_.c:1815
+msgid "Preparing PrinterDrake ..."
+msgstr "F�rbereder PrinterDrake..."
+
+#: ../../printerdrake.pm_.c:1845
+msgid "Would you like to configure printing?"
+msgstr "Vill du konfigurera utskrift?"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr "Skrivarsystem: "
 
-#: ../../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 ""
-"Varje printerk� (dit skrivarjobben skickas) beh�ver ett\n"
-"namn (ofta lp) och en spool-katalog associerad med den. Vilket\n"
-"namn och vilken katalog ska anv�ndas f�r denna k� och hur �r skrivaren "
-"kopplad?"
+"F�ljande skrivare �r inst�llda.\n"
+"Klicka p� n�gon av dem f�r att �ndra den\n"
+"eller f�r att f� information om den.\n"
+"Klicka p� \"L�gg till skrivare\" f�r att l�gga till en ny skrivare."
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "K�namn"
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "Normall�ge"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Standard)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Skrivare p� CUPS-fj�rrserver"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+msgid "Printer(s) on remote server(s)"
+msgstr "Skrivare p� fj�rrserver"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+msgid "Add printer"
+msgstr "L�gg till skrivare"
+
+#: ../../printerdrake.pm_.c:1977 ../../printerdrake.pm_.c:1993
+#: ../../printerdrake.pm_.c:2128
+msgid "Do you want to configure another printer?"
+msgstr "Vill du konfigurera en annan skrivare?"
+
+#: ../../printerdrake.pm_.c:2003
+msgid "Modify printer configuration"
+msgstr "�ndra skrivarinst�llning"
+
+#: ../../printerdrake.pm_.c:2004
+#, c-format
+msgid ""
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
+msgstr ""
+"Skrivare %s: %s %s\n"
+"Vad vill du �ndra p� den h�r skrivaren?"
+
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr "K�r!"
+
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+msgid "Printer connection type"
+msgstr "Skrivarens anslutningstyp"
+
+#: ../../printerdrake.pm_.c:2016 ../../printerdrake.pm_.c:2066
+msgid "Printer name, description, location"
+msgstr "Skrivarens namn, beskrivning, plats"
+
+#: ../../printerdrake.pm_.c:2018 ../../printerdrake.pm_.c:2081
+msgid "Printer manufacturer, model, driver"
+msgstr "Skrivarens tillverkare, modell, drivrutin"
+
+#: ../../printerdrake.pm_.c:2019 ../../printerdrake.pm_.c:2082
+msgid "Printer manufacturer, model"
+msgstr "Skrivarens tillverkare, modell"
+
+#: ../../printerdrake.pm_.c:2028 ../../printerdrake.pm_.c:2092
+msgid "Set this printer as the default"
+msgstr "Anv�nd denna skrivare som standardskrivare"
+
+#: ../../printerdrake.pm_.c:2029 ../../printerdrake.pm_.c:2097
+msgid "Print test pages"
+msgstr "Skriv ut testsidor"
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "Spoolkatalog"
+#: ../../printerdrake.pm_.c:2030 ../../printerdrake.pm_.c:2099
+msgid "Know how to print with this printer"
+msgstr "K�nner till hur man skriver ut med denna skrivare"
 
-#: ../../printerdrake.pm_.c:491
-msgid "Printer Connection"
-msgstr "Skrivarkoppling"
+#: ../../printerdrake.pm_.c:2031 ../../printerdrake.pm_.c:2101
+msgid "Remove printer"
+msgstr "Ta bort skrivare"
 
-#: ../../raid.pm_.c:33
+#: ../../printerdrake.pm_.c:2071
+#, c-format
+msgid "Removing old printer \"%s\" ..."
+msgstr "Tar bort gammal skrivare \"%s\"..."
+
+#: ../../printerdrake.pm_.c:2096
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr "Skrivaren \"%s\" kommer nu att anv�nds som standardskrivare."
+
+#: ../../printerdrake.pm_.c:2103
+#, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "Vill du verkligen ta bort skrivaren \"%s\"?"
+
+#: ../../printerdrake.pm_.c:2105
+#, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "Tar bort skrivare \"%s\"..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+msgid "Proxy configuration"
+msgstr "Proxy-konfiguration"
+
+#: ../../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 ""
+"V�lkommen till proxyverktyget.\n"
+"\n"
+"H�r kommer du att kunna s�tta upp http- och ftp-proxy\n"
+"med eller utan anv�ndarnamn och l�senord.\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 ""
+"Fyll i information om http-proxy.\n"
+"L�mna blankt om du inte vill ha n�gon 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 "port"
+
+#: ../../proxy.pm_.c:44
+msgid "Url should begin with 'http:'"
+msgstr "URL ska b�rja med \"http:\""
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+msgid "The port part should be numeric"
+msgstr "Portdelen ska vara numerisk."
+
+#: ../../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 ""
+"Fyll i information om ftp-proxy.\n"
+"L�mna blankt om du inte vill ha n�gon ftp-proxy."
+
+#: ../../proxy.pm_.c:65
+msgid "Url should begin with 'ftp:'"
+msgstr "URL ska b�rja med \"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 ""
+"Ange anv�ndarnamn och l�senord f�r proxy.\n"
+"L�mna blankt om du inte vill ha n�got anv�ndarnamn/l�senord."
+
+#: ../../proxy.pm_.c:80
+msgid "login"
+msgstr "anv�ndarnamn"
+
+#: ../../proxy.pm_.c:82
+msgid "password"
+msgstr "l�senord"
+
+#: ../../proxy.pm_.c:84
+msgid "re-type password"
+msgstr "bekr�fta l�senord"
+
+#: ../../proxy.pm_.c:88
+msgid "The passwords don't match. Try again!"
+msgstr "Du angav inte samma l�senord. F�rs�k igen!"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Kan inte l�gga till en partition till en _formaterad_ RAID md%d"
 
-#: ../../raid.pm_.c:103
-msgid "Can't write file $file"
-msgstr "Kan inte skriva till fil $file"
+#: ../../raid.pm_.c:111
+#, c-format
+msgid "Can't write file %s"
+msgstr "Kan inte skriva fil %s"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed"
 msgstr "mkraid misslyckades"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid misslyckades (kanske dinns det inga raidverktyg)"
+msgstr "mkraid misslyckades (kanske finns det inga raid-verktyg)"
 
-#: ../../raid.pm_.c:144
+#: ../../raid.pm_.c:152
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
-msgstr "Inte tillr�ckligt m�nga partitioner f�r RAID level %d\n"
+msgstr "Inte tillr�ckligt m�nga partitioner f�r RAID-niv� %d\n"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:15
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr "Starta ljudsystemet ALSA (Advanced Linux Sound Architecture)"
 
-#: ../../services.pm_.c:17
+#: ../../services.pm_.c:16
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron k�r kommandon vid angivna, periodiska tidpunkter."
 
-#: ../../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 anv�nds f�r att kontrollera bateristatusen i en b�rbar dator,\n"
-"samt logga denna till syslog. Den kan �ven anv�ndas f�r att ta ner\n"
-"datorn om batteriet skulle h�lla p� att ta slut."
+"Apmd anv�nds f�r att �vervaka batteristatusen i en b�rbar dator,\n"
+"samt logga denna till syslog. Den kan �ven anv�ndas f�r att st�nga ner\n"
+"datorn om batteriet h�ller p� att ta slut."
 
-#: ../../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 ""
-"Denna tj�nst k�r kommandon som givits till 'at'-kommandot, vid den\n"
-"tidpunkt som angets. At kan �ven k�ra batch-kommandon d�\n"
-"datorns last minskat under en angiven niv�."
+"Denna tj�nst k�r kommandon som givits till \"at\"-kommandot, vid den\n"
+"tidpunkt som angetts. At kan �ven k�ra batch-kommandon d�\n"
+"datorns belastning minskat under en angiven niv�."
 
-#: ../../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 "
@@ -6959,38 +7763,38 @@ msgid ""
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 "Cron-tj�nsten kan k�ra program periodiskt vid angivna klockslag.\n"
-"Den h�r cron-demonen, vixie cron  har ett antal ut�kningar och\n"
+"Den h�r cron-demonen, vixie cron har ett antal ut�kningar och\n"
 "f�rb�ttringar �ver standard UNIX cron, bland annat h�gre s�kerhet\n"
-"och b�ttre konfigurerbarhet."
+"och b�ttre inst�llningsm�jligheter."
 
-#: ../../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 tillhandah�ller mussupport f�r textbasserade Linux-applikationer,\n"
-"s� som Midnight Commander. GPM tillhandah�ller ocks� mus-baserad\n"
-"kopiering och inklistring samt pop-up-menyer i consolen."
+"GPM tillhandah�ller musst�d f�r textbaserade Linux-program,\n"
+"s� som Midnight Commander. GPM tillhandah�ller ocks� musbaserad\n"
+"kopiering och inklistring samt pop-up-menyer i konsollen."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:27
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
-"HardDrake letar efter h�rdvara och kan anv�ndas f�r att konfigurera\n"
+"Harddrake letar efter h�rdvara och kan anv�ndas f�r att konfigurera\n"
 "ny/�ndrad h�rdvara."
 
-#: ../../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 �r en www-server (World Wide Web-server).\n"
-"Den tillhandah�ller HTML-dokument och CGI-script."
+"Den tillhandah�ller HTML-dokument och CGI-skript."
 
-#: ../../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 "
@@ -6999,50 +7803,49 @@ msgid ""
 "disables\n"
 "all of the services it is responsible for."
 msgstr ""
-"Inetd �r en bas-server som startar andra internetservrar. Den �r\n"
+"Inetd �r en basserver som startar andra Internetservrar. Den �r\n"
 "ansvarig f�r startandet av m�nga olika tj�nster, s�som telnet, ftp,\n"
-"rsh, och rlogin. Om inetd inte k�rs, kan ingen av dessa servrar k�ras."
+"rsh och rlogin. Om inetd �r inaktiverad, kan ingen av dessa servrar k�ras."
 
-#: ../../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 ""
-"Starta paketfiltrering f�r Linux kernel 2.2-serien, f�r att s�tta\n"
+"Starta paketfiltrering f�r 2.2-serien av Linuxk�rnan, f�r att s�tta\n"
 "upp en brandv�gg som skyddar din maskin fr�n n�tverksattacker."
 
-#: ../../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 ""
-"Den h�r tj�nsten laddar den valda tangentbordsmappningen som st�llts in\n"
-"i /etc/sysconfig/keyboard. Inst�llningen kan �ndras med kbdconfig-"
-"verktyget.\n"
-"Du b�r k�ra detta paket p� de flesta datorer."
+"Den h�r tj�nsten laddar den valda tangentbordsmappningen som\n"
+"st�llts in i /etc/sysconfig/keyboard. Inst�llningen kan �ndras med\n"
+"kbdconfig-verktyget. Du b�r aktivera detta paket p� de flesta datorer."
 
-#: ../../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 ""
-"Automatisk omgenerering av kernelhuvud i /boot f�r\n"
+"Automatisk omgenerering av k�rnans huvud i /boot f�r\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 "Automatisk avk�nning och konfiguration av h�rdvara vid uppstart."
+msgstr "Automatisk uppt�ckt och konfiguration av h�rdvara vid uppstart."
 
-#: ../../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 kommer emellan�t att utf�ra olika uppdrag\n"
+"Linuxconf kommer emellan�t att utf�ra olika aktiviteter\n"
 "vid uppstart f�r att h�lla systemet i skick."
 
-#: ../../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)."
@@ -7050,15 +7853,15 @@ msgstr ""
 "Lpd �r en skrivardemon som beh�vs f�r att lpr skall fungera korrekt.\n"
 "Det �r i princip en server som tilldelar utskrifter till skrivare."
 
-#: ../../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 Server, anv�nds f�r att bygga en h�gpresterande och\n"
-"h�rt anv�nd server."
+"tillg�nglig server."
 
-#: ../../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."
@@ -7066,31 +7869,31 @@ msgstr ""
 "Named (BIND) �r en namnserver (Domain Name Server, DNS) som kan\n"
 "anv�ndas f�r att sl� upp IP-adresser fr�n datornamn."
 
-#: ../../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 "Monterar/avmonterar alla n�tverksfilsystem (NFS, SMB och NCP)."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
-"Aktiverar/avaktiverar alla de n�tverkskort\n"
-"som konfigurerats att starta vid boot."
+"Aktiverar/inaktiverar alla de n�tverkskort som konfigurerats\n"
+"att starta vid uppstart."
 
-#: ../../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 �r ett popul�rt protokoll f�r fildelning �ver TCP/IP-n�tverk.\n"
-"Den h�r demonen �r en server f�r detta protokoll,\n"
-"och konfigureras i filen /etc/exports."
+"Den h�r demonen �r en server f�r detta protokoll, och konfigureras\n"
+"i filen /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."
@@ -7098,49 +7901,49 @@ msgstr ""
 "NFS �r ett popul�rt protokoll f�r fildelning �ver TCP/IP-n�tverk.\n"
 "Den h�r demonen tillhandah�ller NFS-fill�sning."
 
-#: ../../services.pm_.c:61
+#: ../../services.pm_.c:60
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
 msgstr ""
-"Automatiskt aktivera numlock f�r konsoll�ge\n"
+"Aktivera automatiskt numlock f�r konsoll�ge\n"
 "och XFree vid uppstart."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:62
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr "Skapa st�d f�r OKI 4w och kompatibla Windowsskrivare."
 
-#: ../../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 anv�nds f�r att ansluta t.ex. ethernet-n�tverkskort och modem till\n"
-"b�rbara datorer. PCMCIA-tj�nsten startas inte om de inte beh�vs, s� det �r\n"
-"helt s�kert att ha det installerat, �ven p� datorer som inte anv�nder det."
+"PCMCIA anv�nds f�r att ansluta t ex ethernet-n�tverkskort och modem till\n"
+"b�rbara datorer. PCMCIA-tj�nsten startas inte om den inte beh�vs, s� det �r\n"
+"helt s�kert att ha den installerad, �ven p� datorer som inte anv�nder den."
 
-#: ../../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 ""
-"Portmappern hanterar RPC-anslutningar, vilka anv�nds av protokoll som t.ex.\n"
+"Portmappern hanterar RPC-anslutningar, vilka anv�nds av protokoll som t ex\n"
 "NFS och NIS. En portmapper m�ste k�ras p� de maskiner som skall fungera\n"
 "som server f�r s�dana protokoll."
 
-#: ../../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 ""
 "Postfix �r en MTA (Mail Transport Agent), vilket �r det\n"
-"program som flyttar e-mail mellan datorer."
+"program som flyttar e-post mellan datorer."
 
-#: ../../services.pm_.c:72
+#: ../../services.pm_.c:71
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -7148,26 +7951,25 @@ msgstr ""
 "Sparar och �terladdar enropi-poolen f�r att ge h�gre kvalitet\n"
 "p� systemets slumptalsgenerator."
 
-#: ../../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 ""
-"Tilldela raw-enheter till blockenheter (som t.ex. h�rddisk-\n"
+"Tilldela raw-enheter till blockenheter (som t ex h�rddisk-\n"
 "partitioner), f�r anv�ndning av program s�som 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-demonen uppdaterar automatiskt IP-routing-tabeller via RIP-"
-"protokollet.\n"
-"RIP �r mycket v�lanv�nt p� mindre n�tverk, men f�r komplexare n�t kr�vs\n"
-"kraftfullare protokoll."
+"Routed-demonen uppdaterar automatiskt IP-routing-tabeller via RIP-\n"
+"protokollet. RIP �r mycket v�lanv�nt p� mindre n�tverk, men f�r komplexare\n"
+"n�t kr�vs kraftfullare protokoll."
 
-#: ../../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."
@@ -7175,7 +7977,7 @@ msgstr ""
 "Rstat-protokollet l�ter anv�ndare se hur mycket en\n"
 "annan dator som k�r en rstat-demon anv�nds."
 
-#: ../../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."
@@ -7183,80 +7985,179 @@ msgstr ""
 "Rusers-protokollet l�ter anv�ndare se vilka som �r inloggade p�\n"
 "en annan dator som k�r en rusers-demon."
 
-#: ../../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-protokollet l�ter anv�ndare se finns p�\n"
-"en annan dator som k�r en rwho-demon (liknar finger)."
+"Rwho-protokollet l�ter fj�rranv�ndare se en lista p� alla anv�ndare\n"
+"som �r inloggade p� en annan dator som k�r en rwho-demon (liknar finger)."
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 msgid "Launch the sound system on your machine"
 msgstr "Starta ljudsystemet p� din maskin"
 
-#: ../../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 �r en demon genom vilken andra demoner sk�ter sin\n"
-"loggning till diverse olika logfiler. Det �r en bra id� att alltid\n"
-"k�ra syslog."
+"loggning till diverse olika loggfiler. Det �r en god id�\n"
+"att alltid k�ra syslog."
 
-#: ../../services.pm_.c:88
+#: ../../services.pm_.c:87
 msgid "Load the drivers for your usb devices."
 msgstr "Ladda drivrutinerna f�r dina USB-enheter."
 
-#: ../../services.pm_.c:89
+#: ../../services.pm_.c:88
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Startar X Font Server (det beh�vs f�r att k�ra XFree)"
+msgstr "Startar X Font Server (detta �r obligatoriskt f�r att k�ra 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 "V�lj vilka tj�nster som skall starta automatiskt vid uppstart"
+msgstr "V�lj vilka tj�nster som ska startas automatiskt vid uppstart"
+
+#: ../../services.pm_.c:126
+msgid "Printing"
+msgstr "Skrivare"
+
+#: ../../services.pm_.c:127
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm_.c:130
+msgid "File sharing"
+msgstr "Fildelning"
+
+#: ../../services.pm_.c:132
+msgid "System"
+msgstr "System"
 
 #: ../../services.pm_.c:137
+msgid "Remote Administration"
+msgstr "Fj�rradministration"
+
+#: ../../services.pm_.c:145
+msgid "Database Server"
+msgstr "Databasserver"
+
+#: ../../services.pm_.c:174
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr "Tj�nster: %d aktiverad f�r %d registrerad"
+
+#: ../../services.pm_.c:186
+msgid "Services"
+msgstr "Tj�nster"
+
+#: ../../services.pm_.c:198
 msgid "running"
-msgstr "k�r"
+msgstr "startad"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "stoppad"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
 msgstr "Tj�nster och demoner"
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
 msgstr ""
-"Ingen mer information\n"
-"finns om denna tj�nst, tyv�rr."
+"Tyv�rr, ingen ytterligare information\n"
+"om den h�r tj�nsten."
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "Vid uppstart"
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../standalone.pm_.c:25
+msgid "Installing packages..."
+msgstr "Installerar paket..."
+
+#: ../../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 ""
-"Jag kan inte l�sa din partitionstabell - den �r alldeles f�r trasig :(\n"
-"Jag kommer nu f�rs�ka ta bort alla felaktiga partitioner"
+"Din partitionstabell kan inte l�sas - den �r alldeles f�r trasig.\n"
+"Jag kommer nu att f�rs�ka rensa alla felaktiga partitioner."
+
+#: ../../standalone/drakautoinst_.c:44
+msgid "Error!"
+msgstr "Fel!"
+
+#: ../../standalone/drakautoinst_.c:45
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr "Den n�dv�ndiga avbildsfilen \"%s\" kan inte hittas."
+
+#: ../../standalone/drakautoinst_.c:47
+msgid "Auto Install Configurator"
+msgstr "Konfiguration f�r automatisk installation"
 
-#: ../../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 ""
+"Du �r p� v�g att konfigurera en automatisk installationsdiskett. Denna "
+"funktion �r en aning riskfylld och m�ste anv�ndas f�rsiktigt.\n"
+"\n"
+"Med den funktionen kan du g�ra repris av installationen du gjorde p� denna "
+"dator, genom att g� igenom n�gra steg och ange dess v�rden.\n"
+"\n"
+"F�r maximal s�kerhet sker partitionering och formatering aldrig automatiskt, "
+"oavsett vad du v�ljer vid installationen av denna dator.\n"
+"\n"
+"Vill du forts�tta?"
+
+#: ../../standalone/drakautoinst_.c:70
+msgid "Automatic Steps Configuration"
+msgstr "Konfiguration av automatiska steg"
+
+#: ../../standalone/drakautoinst_.c:71
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+"V�lj f�r varje steg om det ska vara en repris av din installation eller om "
+"det ska utf�ras manuellt."
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "Gratulerar!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+"Disketten har genererats.\n"
+"Du kan nu g�ra en repris av din installation."
+
+#: ../../standalone/drakgw_.c:36 ../../standalone/drakgw_.c:181
 msgid "Internet Connection Sharing"
 msgstr "Internetdelning"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Internetdelning �r f�r n�rvarande aktiverat"
 
-#: ../../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"
@@ -7268,31 +8169,31 @@ msgstr ""
 "\n"
 "Vad vill du g�ra?"
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "inaktivera"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "dismiss"
 msgstr "avsluta"
 
-#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
 msgid "reconfigure"
-msgstr "omkonfigurera"
+msgstr "konfigurera om"
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "Inaktiverar servrar..."
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "Internetdelning �r nu inaktiverat"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Internetdelning f�r n�rvarande inaktiverat"
 
-#: ../../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"
@@ -7304,27 +8205,19 @@ msgstr ""
 "\n"
 "Vad vill du g�ra?"
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "aktivera"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "Aktiverar servrar..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "Internetdelning �r nu aktiverat"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr "Inneh�llet i konfigurationsfilen kunde inte tolkas."
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Ok�nt format p� konfigurationsfilen"
-
-#: ../../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 "
@@ -7337,32 +8230,36 @@ msgstr ""
 "Med den funktionen kan andra datorer i ditt n�tverk anv�nda din dators "
 "Internetanslutning.\n"
 "\n"
-"Notera: du beh�ver en dedikerad n�tverksadapter f�r att s�tta upp ett lokalt "
-"n�tverk (LAN)."
+"Observera: du beh�ver ett dedikerat n�tverkskort f�r att s�tta upp ett "
+"lokalt n�tverk (LAN)."
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s (using module %s)"
-msgstr "Interface %s (anv�nder modul %s)"
+msgstr "Gr�nssnitt %s (anv�nder modul %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:209
 #, c-format
 msgid "Interface %s"
-msgstr "Interface %s"
+msgstr "Gr�nssnitt %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:217
 msgid "No network adapter on your system!"
-msgstr "Ingen n�tverksadapter i ditt system!"
+msgstr "Inget n�tverkskort i ditt system!"
 
-#: ../../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 ""
-"Ingen ethernet n�tverksadapter har uppt�ckts i ditt system. Var v�nlig k�r "
+"Ingen ethernet-n�tverkskort har hittats i ditt system. K�r "
 "konfigurationsverktyget f�r h�rdvara."
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "N�tverksgr�nssnitt"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7371,37 +8268,35 @@ msgid ""
 "\n"
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
-"Det finns bara en konfigurera n�tverksadapter i ditt system:\n"
+"Det finns bara ett konfigurerat n�tverkskort i ditt system:\n"
 "\n"
 "%s\n"
 "\n"
-"Jag �r p� v�g att s�tta upp ditt lokala n�tverk med den adaptern."
+"Jag �r p� v�g att s�tta upp ditt lokala n�tverk med det kortet."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
-msgstr ""
-"Var v�nlig v�lj vilken n�tverksadapter som ska kopplas mot ditt lokala "
-"n�tverk."
+msgstr "V�lj vilket n�tverkskort som ska kopplas mot ditt lokala n�tverk."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
-"Varning, n�tverksadaptern �r redan konfigurerad. Jag kommer att konfigurera "
-"om den."
+"Varning, n�tverkskortet �r redan konfigurerat. Jag kommer att konfigurera om "
+"det."
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr ""
-"Potentiell LAN-adresskonflikt funnen i nuvarande konfiguration av $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "Potentiell LAN-adresskonflikt hittad i aktuell konfiguration av %s!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid "Firewalling configuration detected!"
 msgstr "Brandv�ggskonfiguration uppt�ckt!"
 
-#: ../../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."
@@ -7409,23 +8304,20 @@ msgstr ""
 "Varning! En existerande brandv�ggskonfiguration har uppt�ckts. Du beh�ver "
 "eventuellt en manuell fix efter installationen."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring..."
 msgstr "Konfigurerar..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:278
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Konfigurerar skript, installerar mjukvara, startar servrar..."
 
-#: ../../standalone/drakgw_.c:307
-msgid "Problems installing package $_"
-msgstr "Problem att installera $_"
-
-#: ../../standalone/drakgw_.c:590
-msgid "Congratulations!"
-msgstr "Gratulerar!"
+#: ../../standalone/drakgw_.c:311
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Problem att installera paket %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 "
@@ -7435,23 +8327,23 @@ msgstr ""
 "Du kan nu dela Internetanslutning med andra datorer i ditt lokala n�tverk, "
 "genom automatisk n�tverkskonfiguration (DHCP)."
 
-#: ../../standalone/drakgw_.c:608
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "Konfigurationen �r redan gjord, men �r f�r n�rvarande inaktiverad."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
-msgstr "Konfigurationen har redan gjorts och �r f�r n�rvarande aktiverad."
+msgstr "Konfigurationen �r redan gjord och �r f�r n�rvarande aktiverad."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Ingen Internetdelning har varit konfigurerad."
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Konfigurera Internetanslutning och delning"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7464,85 +8356,86 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Klicka p� Konfigurera f�r att starta inst�llningsguiden."
+"Klicka p� \"Konfigurera\" f�r att starta inst�llningsguiden."
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
-msgstr "N�tverkskonfiguration (%d adaptrar)"
+msgstr "N�tverkskonfiguration (%d kort)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
-msgstr "Profil:"
+msgstr "Profil: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
-msgstr "Radera profil..."
+msgstr "Ta bort profil..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
-msgstr "Profil att radera:"
+msgstr "Profil att ta bort:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "Ny profil..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "Namnet p� profilen du vill att skapa:"
+#: ../../standalone/draknet_.c:134
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
+msgstr ""
+"Namn p� profilen som ska skapas (den nya profilen skapas som en kopia av den "
+"aktuella):"
 
-#: ../../standalone/draknet_.c:140
+#: ../../standalone/draknet_.c:160
 msgid "Hostname: "
-msgstr "V�rdnamn:"
+msgstr "V�rddatornamn: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
-msgstr "Internetaccess"
+msgstr "Internet�tkomst"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 msgid "Type:"
-msgstr "Typ: "
+msgstr "Typ:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:354
+#: ../../standalone/draknet_.c:183 ../../standalone/draknet_.c:397
 msgid "Interface:"
-msgstr "Interface:"
+msgstr "Gr�nssnitt:"
 
-#: ../../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 "Ansluten"
 
-#: ../../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 "Ej ansluten"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Connect..."
 msgstr "Anslut..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:358
+#: ../../standalone/draknet_.c:197 ../../standalone/draknet_.c:411
 msgid "Disconnect..."
 msgstr "Koppla ner..."
 
-#: ../../standalone/draknet_.c:191
+#: ../../standalone/draknet_.c:215
 msgid "Starting your connection..."
 msgstr "Startar din anslutning..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "Avslutar din anslutning..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7554,120 +8447,116 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "som root."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "Systemet har kopplats ner."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
-msgstr "Konfigurera Internetaccess"
+msgstr "Konfigurera Internet�tkomst..."
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:411
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "LAN-konfiguration"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adapter"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Drivrutin"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
-msgstr "Interface"
+msgstr "Gr�nssnitt"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+msgid "State"
+msgstr "Status"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "Konfigurera lokalt n�tverk..."
 
-#: ../../standalone/draknet_.c:283
-msgid "Normal Mode"
-msgstr "Normall�ge"
+#: ../../standalone/draknet_.c:279
+msgid "Click here to launch the wizard ->"
+msgstr "Klicka h�r f�r att starta guiden ->"
 
-#: ../../standalone/draknet_.c:288
+#: ../../standalone/draknet_.c:306
 msgid "Apply"
 msgstr "Verkst�ll"
 
-#: ../../standalone/draknet_.c:307
+#: ../../standalone/draknet_.c:325
 msgid "Please Wait... Applying the configuration"
-msgstr "Var god v�nta... till�mpar konfigurationen"
+msgstr "V�nta... verkst�ller konfigurationen"
 
-#: ../../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 ""
+"Du har inga gr�nssnitt konfigurerade.\n"
+"Konfigurera dem f�rst genom att klicka p� \"Konfigurera\"."
 
-#: ../../standalone/draknet_.c:415
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "LAN-konfiguration"
 
-#: ../../standalone/draknet_.c:423
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
-msgstr "Adapter %s: %s"
+msgstr "Kort %s: %s"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
-msgstr "Bootprotokoll"
+msgstr "Startprotokoll"
 
-#: ../../standalone/draknet_.c:430
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
-msgstr "Startad vid boot"
+msgstr "Startad vid uppstart"
 
-#: ../../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 "Inaktivera"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+msgid "activate now"
+msgstr "aktivera nu"
 
-#: ../../standalone/draknet_.c:466 ../../standalone/draknet_.c:470
-msgid "Enable"
-msgstr "Aktivera"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+msgid "desactivate now"
+msgstr "inaktivera nu"
 
-#: ../../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 ""
+"Du har ingen Internetanslutning.\n"
+"Skapa en f�rst genom att klicka p� \"Konfigurera\"."
 
-#: ../../standalone/draknet_.c:528
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "Konfiguration av Internetanslutning"
 
-#: ../../standalone/draknet_.c:532
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "Konfiguration av Internetanslutning"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
-msgstr "Anslutningstyp:"
+msgstr "Anslutningstyp: "
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parametrar"
 
-#: ../../standalone/draknet_.c:560
-msgid "Provider dns 1 (optional)"
-msgstr "Leverant�rens dns 1 (frivilligt)"
-
-#: ../../standalone/draknet_.c:561
-msgid "Provider dns 2 (optional)"
-msgstr "Leverant�rens dns 2 (frivilligt)"
-
-#: ../../standalone/draknet_.c:574
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Ethernet-kort"
 
-#: ../../standalone/draknet_.c:575
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP-klient"
 
@@ -7689,18 +8578,18 @@ 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 ""
-"Den h�r niv�n ska anv�ndas med f�rsiktighet. Den g�r ditt system enklare "
-"att\n"
-"anv�nda, men �ven v�ldigt k�nsligt. Det ska inte anv�ndas p� en dator som\n"
-"�r ansluten till andra datorer eller till Internet. L�senord anv�nds inte."
+"Den h�r niv�n ska anv�ndas med f�rsiktighet. Den g�r ditt system enklare\n"
+"att anv�nda, men �ven v�ldigt k�nsligt. Den ska inte anv�ndas p� en dator\n"
+"som �r ansluten till andra datorer eller till Internet. L�senord anv�nds "
+"inte."
 
 #: ../../standalone/draksec_.c:32
 msgid ""
 "Password are now enabled, but use as a networked computer is still not "
 "recommended."
 msgstr ""
-"L�senord �r nu aktiverade, men att anv�nda systemet i ett n�tverk �r �nd�\n"
-"inte att rekomendera."
+"L�senord �r nu aktiverade, men att anv�nda systemet i ett n�tverk �r �nd� "
+"inte att rekommendera."
 
 #: ../../standalone/draksec_.c:33
 msgid ""
@@ -7715,7 +8604,7 @@ 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 ""
-"Det h�r standards�kerheten rekommenderad f�r en dator som ansluter till\n"
+"Det h�r �r standards�kerheten rekommenderad f�r en dator som ansluter till\n"
 "Internet som en klient. Det finns inga s�kerhetskontroller."
 
 #: ../../standalone/draksec_.c:37
@@ -7738,119 +8627,65 @@ msgstr ""
 "Samma f�rdelar som Niv� 4, men nu �r systemet helt st�ngt.\n"
 "Maximal s�kerhet."
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+msgid "Security level"
+msgstr "S�kerhetsniv�"
+
+#: ../../standalone/draksec_.c:67
+msgid "Use libsafe for servers"
+msgstr "Anv�nd \"libsafe\" f�r servrar"
+
+#: ../../standalone/draksec_.c:68
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr ""
+"Ett bibliotek som skyddar dig mot \"buffer overflow\"- och \"format string\"-"
+"attacker."
+
+#: ../../standalone/draksec_.c:72
 msgid "Setting security level"
-msgstr "S�tter s�kerhetsniv�"
+msgstr "Verkst�ller s�kerhetsniv�"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:47
 msgid "Control Center"
 msgstr "Kontrollpanelen"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:48
 msgid "Choose the tool you want to use"
 msgstr "V�lj vilket verktyg du vill anv�nda"
 
 #: ../../standalone/keyboarddrake_.c:16
 msgid "usage: keyboarddrake [--expert] [keyboard]\n"
-msgstr "bruk: keyboarddrake [--expert] [keyboard]\n"
+msgstr "anv�ndning: keyboarddrake [--expert] [keyboard]\n"
 
 #: ../../standalone/keyboarddrake_.c:36
 msgid "Do you want the BackSpace to return Delete in console?"
-msgstr "Vill du att 'Backspace' ska returnera 'Delete' i konsolen?"
+msgstr "Vill du att \"Backspace\" ska returnera \"Delete\" i konsollen?"
 
 #: ../../standalone/livedrake_.c:23
 msgid "Change Cd-Rom"
-msgstr "Byt CD-ROM"
+msgstr "Byt CD-rom"
 
 #: ../../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 ""
-"Var god s�tt in CD-skivan med installationen och klicka p� Ok.\n"
-"Om du inte har den, tryck Avbryt f�r att undvika live-uppgradering."
+"S�tt in CD-skivan med installationen och klicka p� \"Ok\".\n"
+"Om du inte har den, klicka p� \"Avbryt\" f�r att undvika live-uppdatering."
 
 #: ../../standalone/livedrake_.c:34
 msgid "Unable to start live upgrade !!!\n"
-msgstr "Kan inte starta live-uppgraderingen! \n"
+msgstr "Kan inte starta live-uppdateringen!\n"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "ingen serial_usb hittades\n"
 
-#: ../../standalone/mousedrake_.c:54
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "Emulera tredje knappen?"
 
-#: ../../standalone/mousedrake_.c:131
-#, fuzzy
-msgid "Test the mouse here."
-msgstr "Var god testa musen"
-
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-msgid "Network Monitoring"
-msgstr "N�tverks�vervakning"
-
-#: ../../standalone/net_monitor_.c:56
-msgid "Statistics"
-msgstr "Statistik"
-
-#: ../../standalone/net_monitor_.c:59
-msgid "Sending Speed: "
-msgstr "S�ndningshastighet:"
-
-#: ../../standalone/net_monitor_.c:61
-msgid "Receiving Speed: "
-msgstr "Mottagningshastiget:"
-
-#: ../../standalone/net_monitor_.c:66
-msgid "Close"
-msgstr "St�ng"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Connecting to Internet "
-msgstr "Ansluter till Internet"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-msgid "Disconnecting from Internet "
-msgstr "Kopplar ner fr�n Internet."
-
-#: ../../standalone/net_monitor_.c:114
-msgid "Disconnection from Internet failed."
-msgstr "Nerkopplingen fr�n Internet misslyckades."
-
-#: ../../standalone/net_monitor_.c:115
-msgid "Disconnection from Internet complete."
-msgstr "Nerkopplingen fr�n Internet genomf�rd."
-
-#: ../../standalone/net_monitor_.c:117
-msgid "Connection complete."
-msgstr "Anslutningen genomf�rd."
-
-#: ../../standalone/net_monitor_.c:118
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"Anslutningen misslyckades.\n"
-"Kontrollera din konfiguration i Mandrake kontrollcenter."
-
-#: ../../standalone/net_monitor_.c:188
-msgid "sent: "
-msgstr "skickat:"
-
-#: ../../standalone/net_monitor_.c:191
-msgid "received: "
-msgstr "mottaget:"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Connect"
-msgstr "Ansluta"
-
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnect"
-msgstr "Koppla ner"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Brandv�ggskonfiguration"
@@ -7869,7 +8704,7 @@ msgstr ""
 "Brandv�gg\n"
 "\n"
 "Du har redan satt upp en brandv�gg.\n"
-"Klicka p� Konfigurera f�r att �ndra p� eller ta bort brandv�ggen"
+"Klicka p� \"Konfigurera\" f�r att �ndra p� eller ta bort brandv�ggen."
 
 #: ../../standalone/tinyfirewall_.c:81
 msgid ""
@@ -7879,24 +8714,91 @@ msgid ""
 msgstr ""
 "Brandv�gg\n"
 "\n"
-"Klicka p� Konfigurera f�r att s�tta upp en standardbrandv�gg"
+"Klicka p� \"Konfigurera\" f�r att s�tta upp en standardbrandv�gg."
+
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "V�lj spr�k"
 
-#: ../../tinyfirewall.pm_.c:10
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "V�lj installationsklass"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Hitta h�rddisk"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Konfigurera mus"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "V�lj tangentbord"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "S�kerhet"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Konfigurera filsystem"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formatera partitioner"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "V�lj paket f�r installation"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Installera system"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "L�gg till anv�ndare"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Konfigurera n�tverk"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Konfigurera tj�nster"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Skapa startdiskett"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Installera starthanterare"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Konfigurera X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Avsluta installationen"
+
+#: ../../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-konfigurator\n"
+"Tinyfirewall-konfigurator\n"
 "\n"
-"Detta konfigurerar en personlig brandv�gg f�r denna Linux-Mandrake-dator.\n"
-"F�r en kraftfull och dedikerad brandv�ggssl�sning, var god ta en titt p� "
-"den\n"
-"specialiserade MandrakeSecurity Firewall-distributionen."
+"Detta konfigurerar en personlig brandv�gg f�r denna Mandrake Linux-dator.\n"
+"F�r en kraftfull och dedikerad brandv�ggsl�sning, ta en titt p� den\n"
+"specialiserade distributionen 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"
@@ -7907,14 +8809,14 @@ msgid ""
 "re-running this application!"
 msgstr ""
 "Vi kommer nu att st�lla fr�gor om vilka tj�nster du vill till�ta\n"
-"Internet att komma �t. Var god t�nk efter noga innan du\n"
+"Internet att komma �t. T�nk efter noga innan du\n"
 "svarar, eftersom din dators s�kerhet �r viktig.\n"
 "\n"
 "Om du inte anv�nder n�gon eller n�gra av dessa tj�nster\n"
 "se till att blockera dem. Du kan �ndra denna konfiguration\n"
 "n�r som helst genom att k�ra detta program p� nytt."
 
-#: ../../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"
@@ -7923,10 +8825,10 @@ msgid ""
 msgstr ""
 "K�r du en webbserver p� denna dator som hela Internet beh�ver komma\n"
 "�t? Om du k�r en webbserver som bara beh�ver kommas �t lokalt av den\n"
-"h�r datorn, kan du med s�kerhet svara 'nej' h�r.\n"
+"h�r datorn, kan du med s�kerhet svara \"Nej\" h�r.\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"
@@ -7934,11 +8836,11 @@ msgid ""
 "\n"
 msgstr ""
 "K�r du en namnserver p� denna dator? Om du inte anv�nder en\n"
-"s�dan, f�r att f�rmedla IP- och zoneinformation till hela Internet, var god\n"
-"svara 'nej'.\n"
+"s�dan, f�r att f�rmedla IP- och zoneinformation till hela Internet,\n"
+"svara \"Nej\".\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"
@@ -7946,13 +8848,13 @@ 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 ""
-"Vill du till�ta inkommande Secure Shell-ansutningar (ssh)? Det\n"
+"Vill du till�ta inkommande Secure Shell-anslutningar (ssh)? Det\n"
 "�r en telnet-ers�ttare som du kan anv�nda f�r att logga in. Om du\n"
-"anv�nder telnet nu, borde du definitivt byta till ssh. telnet �r inte\n"
+"anv�nder telnet nu, borde du definitivt byta till ssh. Telnet �r inte\n"
 "krypterat -- s� attackerare kan stj�la dina l�senord om du anv�nder\n"
-"det. ssh �r krypterat och till�ter inte samma avlyssning."
+"det. Ssh �r krypterat och till�ter inte samma avlyssning."
 
-#: ../../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"
@@ -7960,35 +8862,35 @@ msgid ""
 "telnet.\n"
 msgstr ""
 "Vill du till�ta inkommande telnet-anslutningar?\n"
-"Det inneb�r en stor risk, som vi f�rklarade p� f�rra sk�rmen. Vi\n"
-"rekommenderar starkt att du svarar 'nej' och anv�nder ssh\n"
+"Det inneb�r en stor risk, som vi f�rklarade p� f�rra sk�rmen.\n"
+"Du rekommenderas att svara \"Nej\" och anv�nda ssh\n"
 "ist�llet f�r 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 ""
-"K�r du en FTP-server, som m�ste vara �tkomlig fr�n Internet? Om du g�r det,\n"
+"K�r du en FTP-server som m�ste vara �tkomlig fr�n Internet? Om du g�r det,\n"
 "rekommenderar vi att du bara anv�nder den f�r �verf�ringar med Anonymous.\n"
 "Alla l�senord som skickas av FTP kan stj�las av attackerare eftersom FTP\n"
 "inte anv�nder n�gon kryptering vid �verf�ringen av l�senord.\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 ""
-"K�r du en e-postserver h�r? Om du skickar dina meddelanden\n"
+"K�r du en e-postserver? Om du skickar dina meddelanden\n"
 "genom pine, mutt eller n�gon annan textbaserad e-postklient,\n"
 "g�r du antagligen det. Annars borde du blockera med brandv�gg.\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"
@@ -8000,19 +8902,19 @@ msgstr ""
 "genom denna dator.\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 ""
-"Du verkar k�ra en 2.2-kernel. Om ditt IP-nummer\n"
-"�r automatiskt tilldelat av en dator i ditt hem eller p� jobbet\n"
-"(dynamisk adressering) beh�ver vi till�ta detta att ske.\n"
+"Du verkar k�ra en 2.2-k�rna. Om ditt IP-nummer ska\n"
+"tilldelas automatiskt av en dator i ditt hem eller p� jobbet\n"
+"(dynamisk adressering) beh�ver vi till�ta det att ske.\n"
 "�r s� fallet?\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"
@@ -8026,304 +8928,327 @@ msgstr ""
 "i en st�rre kontorsmilj� och inte har h�rt talas om denna funktion,\n"
 "blir den nog inte det."
 
-#: ../../tinyfirewall.pm_.c:67
+#: ../../tinyfirewall.pm_.c:66
 msgid ""
 "Configuration complete.  May we write these changes to disk?\n"
 "\n"
 "\n"
 "\n"
 msgstr ""
-"Konfigurationen slutf�rd. Ska vi skriva dessa �ndringar till disken?\n"
+"Konfigurationen slutf�rd. Ska dessa �ndringar skrivas till disken?\n"
 "\n"
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Kan inte �ppna %s: %s\n"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "Kan inte �ppna %s f�r skrivning: %s\n"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klienter f�r olika protokoll inklusive ssh"
-
-#: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Utveckling"
-
-#: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Arbetsstation"
-
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Brandv�gg/router"
+msgid "Web/FTP"
+msgstr "Webb/FTP"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Personlig Informationshantering"
+msgid "Network Computer (client)"
+msgstr "N�tverksdator (klient)"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Grafik"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-server, SMB-server, Proxyserver, ssh-server"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "Internet"
+msgid "Office"
+msgstr "Kontor"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "N�tverksdator (klient)"
+msgid "Gnome Workstation"
+msgstr "Gnome arbetsstation"
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Ljudrelaterade verktyg: mp3 eller midi-spelare, mixer, etc"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Verktyg f�r din Palm Pilot eller Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internetstation"
+msgid "Workstation"
+msgstr "Arbetsstation"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kontorsverktyg"
+msgid "Firewall/Router"
+msgstr "Brandv�gg/Router"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimediastation"
+msgid "Domain Name and Network Information Server"
+msgstr "Dom�nnamns- och Network Information-Server"
 
 #: ../../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 ""
-"En samling verktyg f�r att l�sa och skicka e-post och news (pine, mutt, "
-"tin..) och att l�sa p� webben."
-
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C och C++ utvecklingsprogram, bibliotek och include-filer"
+"Kontorsprogram: ordbehandlare (Kword, Abiword), kalkylprogram (Kspread, "
+"Gnumeric), pdf-visare, etc"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Dom�nnamnsserver och Network Information Server"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Ljudrelaterade verktyg: mp3- eller midi-spelare, mixrar, etc"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Program f�r att hantera din ekonomi, som t.ex. gnucash"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "B�cker och \"Howto's\" om Linux och fri mjukvara"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL eller MySQL-databasserver"
+msgid "KDE Workstation"
+msgstr "KDE arbetsstation"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-server, SMB-server, Proxy-server, SSh-server"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentation"
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Windows Maker, Enlightenment, Fvwm, etc"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"En samling verktyg f�r e-post, diskussioner, webb, fil�verf�ring och chatt"
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Verktyg"
+msgid "Database"
+msgstr "Databas"
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL- eller MySQL-databasserver"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafisk omgivning"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Verktyg f�r att underl�tta konfigurationen av din dator"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia - Sound"
 msgstr "Multimedia - Ljud"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "N�jesprogram: arkad, br�dspel, strategi, etc"
+msgid "Utilities"
+msgstr "Verktyg"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videospelare och editorer"
+msgid "Documentation"
+msgstr "Dokumentation"
 
 #: ../../share/compssUsers:999
 msgid "Console Tools"
-msgstr "Konsolverktyg"
+msgstr "Konsollverktyg"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Ljud- och video-spelare och editeringsprogram"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix e-postserver, Inn diskussionsgruppsserver"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Vetenskapligt arbete"
+msgid "Internet station"
+msgstr "Internet-station"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editorer, skal, filverktyg, terminaler"
+msgid "Multimedia station"
+msgstr "Multimedia-station"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "B�cker och 'how-to' f�r Linux och fri programvara"
+msgid "Configuration"
+msgstr "Konfiguration"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"En grafisk milj� med en samling anv�ndarv�nliga applikationer och "
-"skrivbordsverktyg"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Fler grafiska skrivbordsmilj�er (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix e-postserver, Inn diskussionsgruppsserver"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment, den grundl�ggande grafiska milj�n med en samling "
+"tillh�rande verktyg"
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Spel"
+msgid "Graphical Environment"
+msgstr "Grafisk milj�"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Development"
+msgstr "Utveckling"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "N�tverksserver"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Grafiska verktyg som t.ex. The Gimp"
+msgid "Tools to create and burn CD's"
+msgstr "Verktyg f�r att skapa och br�nna CD-skivor"
 
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
-msgstr "Arbetsstation f�r kontoret"
+msgstr "Kontorsarbetsstation"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"The K Desktop Environment, den grundl�ggande grafiska milj�n med en samling "
-"tillh�rande verktyg"
-
-#: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Flera grafiska skrivbord (Gnome, IceWM)"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Verktyg f�r att skapa och br�nna CD-skivor"
+msgid "Graphics programs such as The Gimp"
+msgstr "Grafiska program som till exempel The Gimp"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - CD-br�nning"
+msgid "DNS/NIS "
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid "Archiving, emulators, monitoring"
-msgstr "Arkivering, emulatorer, �vervakning"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Utvecklingsbibliotek, program och include-filer f�r C och C++"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Databas"
+msgid "Network Computer server"
+msgstr "N�tverksserver"
 
 #: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Kontorsverktyg: ordbehandlare (kword, abiword), kalkylprogram (kspread, "
-"gnumeric), pdf-l�sare, etc"
+msgid "Mail/Groupware/News"
+msgstr "E-post/Gruppprogram/Diskussioner"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Webb/FTP"
+msgid "Game station"
+msgstr "Spelstation"
 
 #: ../../share/compssUsers:999
-msgid "Server"
-msgstr "Server"
+msgid "Video players and editors"
+msgstr "Videospelare och editorer"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Privatekonomi"
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafik"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfiguration"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Underh�llande program: arkad, br�dspel, strategi, etc"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"En samling verktyg f�r att l�sa och skicka e-post och nyheter (pine, mutt, "
+"tin..) och f�r att utforska webben"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Andra grafiska omgivningar"
+msgid "Archiving, emulators, monitoring"
+msgstr "Arkivering, emulatorer, �vervakning"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache och Pro-ftpd"
+msgid "Personal Finance"
+msgstr "Personlig ekonomi"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "E-post/Gruppvara/Diskussionsgrupp"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"En grafisk milj� med en samling anv�ndarv�nliga program och skrivbordsverktyg"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "GNOME"
+msgid "Clients for different protocols including ssh"
+msgstr "Klienter f�r olika protokoll inkluderande ssh"
 
 #: ../../share/compssUsers:999
 msgid "Internet gateway"
 msgstr "Internet-gateway"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Verktyg f�r din Palm Pilot och din Visor"
+msgid "Sound and video playing/editing programs"
+msgstr "Redigerings- och uppspelningsprogram f�r video och ljud"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Spelstation"
+msgid "Other Graphical Desktops"
+msgstr "Andra grafiska skrivbordsmilj�er"
 
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editorer, skal, filverktyg, terminaler"
 
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Verktyg f�r att f�renkla konfigureringen av din dator"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Program f�r att hantera din ekonomi, som till exempel gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Samling verktyg f�r e-post, news, webb, fil�verf�ring och chat"
-
-#~ msgid "GB"
-#~ msgstr "GB"
-
-#~ msgid "KB"
-#~ msgstr "KB"
-
-#~ msgid "TB"
-#~ msgstr "TB"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d minuter"
-
-#~ msgid "1 minute"
-#~ msgstr "1 minut"
+msgid "Games"
+msgstr "Spel"
 
-#~ msgid "%d seconds"
-#~ msgstr "%d sekunder"
+#: ../../share/compssUsers:999
+msgid "Personal Information Management"
+msgstr "Personlig informationshantering (PIM)"
 
-#~ msgid "cannot fork: "
-#~ msgstr "kan ej grena:"
+#: ../../share/compssUsers:999
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - CD-br�nning"
 
-#~ msgid "Configure..."
-#~ msgstr "Konfigurera..."
+#: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+msgstr "Vetenskaplig arbetsstation"
+
+#~ msgid ""
+#~ "To print a file from the command line (terminal window) you can either "
+#~ "use the command \"lpr"
+#~ msgstr ""
+#~ "F�r att skriva ut en fil fr�n kommandoraden (terminalf�nster) kan du "
+#~ "antingen anv�nda kommandot \"lpr"
+
+#~ msgid ""
+#~ " <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"
+#~ "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 ""
+#~ " <fil>\" eller ett grafiskt utskriftsverktyg: \"xpp <fil>\" eller "
+#~ "\"qtcups <fil>\". De grafiska verktygen l�ter dig v�lja skrivare och "
+#~ "�ndra alternativinst�llningarna p� ett enkelt s�tt.\n"
+#~ "Dessa kommandon kan du ocks� anv�nda i f�ltet \"Utskriftskommando\" som "
+#~ "finns i utskriftsdialogrutan hos m�nga program. Ange d� inte filnamnet "
+#~ "h�r, eftersom filen som ska skrivas ut tillhandah�lls av programmet.\n"
+
+#~ msgid ""
+#~ " -o option=setting -o switch <file>\". 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 ""
+#~ " -o option=setting -o switch <fil>\". F�r att se en lista p� de "
+#~ "tillg�ngliga alternativen f�r den aktuella skrivaren, l�s antingen listan "
+#~ "som visas nedan eller klicka p� knappen \"Alternativlista f�r utskrift"
+#~ "\".\n"
+#~ "\n"
+
+#~ msgid ""
+#~ " -o option=setting -o switch <file>\". To get a list of the options "
+#~ "available for the current printer click on the \"Print option list\" "
+#~ "button.\n"
+#~ "\n"
+#~ msgstr ""
+#~ " -o option=setting -o switch <fil>\". F�r att se en lista p� de "
+#~ "tillg�ngligaalternativen f�r den aktuella skrivaren, klicka p� knappen "
+#~ "\"Alternativlista f�r utskrift\".\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "To print a file from the command line (terminal window) use the command "
+#~ "\"pdq"
+#~ msgstr ""
+#~ "F�r att skriva ut en fil fr�n kommandoraden (terminalf�nster) anv�nd "
+#~ "kommandot \"pdq"
+
+#~ msgid " <file>\" or \"lpr"
+#~ msgstr " <fil>\" eller \"lpr"
diff --git a/perl-install/share/po/th.po b/perl-install/share/po/th.po
index 13168650f..17ee96fce 100644
--- a/perl-install/share/po/th.po
+++ b/perl-install/share/po/th.po
@@ -1,37 +1,39 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 1999 MandrakeSoft
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) 1999 MandrakeSof
+#
 # Kan Yuenyong <kan@kaiwal.com>, 1999
+# Wachara Chinsettawong <wachara@yahoo.com>, 2001
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-04-17 16:39+0200\n"
+"POT-Creation-Date: 2001-09-21 19:50+0200\n"
 "PO-Revision-Date: 2001-04-05 14:03GMT+7\n"
-"Last-Translator: Wachara Chinsettawong <wacjara@yahoo.com>\n"
+"Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=tis-620\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
-msgstr "Configure all heads independantly"
+#: ../../Xconfigurator.pm_.c:231
+msgid "Configure all heads independently"
+msgstr "Configure all heads independently"
 
-#: ../../Xconfigurator.pm_.c:233
+#: ../../Xconfigurator.pm_.c:232
 msgid "Use Xinerama extension"
 msgstr "Use Xinerama extension"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:235
 #, c-format
 msgid "Configure only card \"%s\" (%s)"
 msgstr "�͹�ԡ੾�С��� \"%s\" (%s)"
 
-#: ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:238
 msgid "Multi-head configuration"
 msgstr "Multi-head configuration"
 
-#: ../../Xconfigurator.pm_.c:240
+#: ../../Xconfigurator.pm_.c:239
 msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
@@ -39,32 +41,33 @@ msgstr ""
 "����ͧ�ͧ�سʹѺʹع��ä͹�ԡẺ multihead \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 ���������"
 
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfigurator.pm_.c:249
 msgid "X server"
 msgstr "X ���������"
 
-#: ../../Xconfigurator.pm_.c:304 ../../Xconfigurator.pm_.c:311
+#: ../../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:307
+#: ../../Xconfigurator.pm_.c:310
 msgid "Which configuration of XFree do you want to have?"
 msgstr "XFree ��Դ�˹���س��ͧ�����"
 
-#: ../../Xconfigurator.pm_.c:320
+#: ../../Xconfigurator.pm_.c:321
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -73,17 +76,18 @@ msgstr ""
 "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."
 
-#: ../../Xconfigurator.pm_.c:322 ../../Xconfigurator.pm_.c:355
+#: ../../Xconfigurator.pm_.c:323 ../../Xconfigurator.pm_.c:356
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr "Your card can have 3D hardware acceleration support with XFree %s."
 
-#: ../../Xconfigurator.pm_.c:324 ../../Xconfigurator.pm_.c:357
+#: ../../Xconfigurator.pm_.c:325 ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:1435
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s with 3D hardware acceleration"
 
-#: ../../Xconfigurator.pm_.c:332 ../../Xconfigurator.pm_.c:346
+#: ../../Xconfigurator.pm_.c:333 ../../Xconfigurator.pm_.c:347
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -92,12 +96,12 @@ msgstr ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 
-#: ../../Xconfigurator.pm_.c:334 ../../Xconfigurator.pm_.c:348
+#: ../../Xconfigurator.pm_.c:335 ../../Xconfigurator.pm_.c:349
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 
-#: ../../Xconfigurator.pm_.c:343
+#: ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -108,27 +112,31 @@ msgstr ""
 "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."
 
-#: ../../Xconfigurator.pm_.c:363
+#: ../../Xconfigurator.pm_.c:364
+msgid "Xpmac (installation display driver)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:368
 msgid "XFree configuration"
 msgstr "��ä͹�ԡ XFree"
 
-#: ../../Xconfigurator.pm_.c:396
+#: ../../Xconfigurator.pm_.c:434
 msgid "Select the memory size of your graphic card"
 msgstr "���͡��Ҵ˹��¤����Ӣͧ��ҿ�Ԥ����"
 
-#: ../../Xconfigurator.pm_.c:443
+#: ../../Xconfigurator.pm_.c:492
 msgid "Choose options for server"
 msgstr "���͡�ͻ��������������Ѻ���������"
 
-#: ../../Xconfigurator.pm_.c:460
+#: ../../Xconfigurator.pm_.c:516
 msgid "Choose a monitor"
 msgstr "���͡���Ҿ"
 
-#: ../../Xconfigurator.pm_.c:460
+#: ../../Xconfigurator.pm_.c:516
 msgid "Monitor"
 msgstr "���Ҿ"
 
-#: ../../Xconfigurator.pm_.c:463
+#: ../../Xconfigurator.pm_.c:519
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -148,39 +156,39 @@ msgstr ""
 "����Թ��������ö�ͧ���Ҿ ����蹹���Ҩ�Դ����������¡Ѻ���Ҿ��\n"
 "�ҡ�������ô���͡���ѾẺ�ҵðҹ"
 
-#: ../../Xconfigurator.pm_.c:470
+#: ../../Xconfigurator.pm_.c:526
 msgid "Horizontal refresh rate"
 msgstr "�ѵ�ҡ�����ê����ǹ͹"
 
-#: ../../Xconfigurator.pm_.c:471
+#: ../../Xconfigurator.pm_.c:527
 msgid "Vertical refresh rate"
 msgstr "�ѵ�ҡ�����ê����ǵ��"
 
-#: ../../Xconfigurator.pm_.c:508
+#: ../../Xconfigurator.pm_.c:564
 msgid "Monitor not configured"
 msgstr "����ա�ä͹�ԡ���Ҿ"
 
-#: ../../Xconfigurator.pm_.c:511
+#: ../../Xconfigurator.pm_.c:567
 msgid "Graphic card not configured yet"
 msgstr "�ѧ�����͹�ԡ��ҿ�ԡ����"
 
-#: ../../Xconfigurator.pm_.c:514
+#: ../../Xconfigurator.pm_.c:570
 msgid "Resolutions not chosen yet"
 msgstr "�ѧ��������͡������Ҵ���Ҿ"
 
-#: ../../Xconfigurator.pm_.c:530
+#: ../../Xconfigurator.pm_.c:587
 msgid "Do you want to test the configuration?"
 msgstr "�س��ͧ��÷��ͺ��ä͹�ԡ�������"
 
-#: ../../Xconfigurator.pm_.c:534
+#: ../../Xconfigurator.pm_.c:591
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "���ѧ ��÷��ͺ�����ʴ����Ҩ����������������ش��÷ӧҹ"
 
-#: ../../Xconfigurator.pm_.c:537
+#: ../../Xconfigurator.pm_.c:594
 msgid "Test of the configuration"
 msgstr "���ͺ��ä͹�ԡ"
 
-#: ../../Xconfigurator.pm_.c:576
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid ""
 "\n"
 "try to change some parameters"
@@ -188,152 +196,156 @@ msgstr ""
 "\n"
 "�ͧ����¹����������ҧ���"
 
-#: ../../Xconfigurator.pm_.c:576
+#: ../../Xconfigurator.pm_.c:632 ../../Xconfigurator.pm_.c:644
 msgid "An error has occurred:"
 msgstr "�բ�ͼԴ��Ҵ�Դ���:"
 
-#: ../../Xconfigurator.pm_.c:598
+#: ../../Xconfigurator.pm_.c:668
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "�͡���� %d �Թҷ�"
 
-#: ../../Xconfigurator.pm_.c:609
+#: ../../Xconfigurator.pm_.c:679
 msgid "Is this the correct setting?"
 msgstr "�١��ͧ�������?"
 
-#: ../../Xconfigurator.pm_.c:617
+#: ../../Xconfigurator.pm_.c:688
 msgid "An error has occurred, try to change some parameters"
 msgstr "�Դ�����Դ��Ҵ��� �ô��䢾���������ҧ���ҧ"
 
-#: ../../Xconfigurator.pm_.c:663 ../../printerdrake.pm_.c:277
-#: ../../services.pm_.c:125
+#: ../../Xconfigurator.pm_.c:759
 msgid "Resolution"
 msgstr "��Ҵ���Ҿ"
 
-#: ../../Xconfigurator.pm_.c:710
+#: ../../Xconfigurator.pm_.c:810
 msgid "Choose the resolution and the color depth"
 msgstr "���͡��Ҵ���Ҿ��Ф��������´��"
 
-#: ../../Xconfigurator.pm_.c:712
+#: ../../Xconfigurator.pm_.c:812
 #, c-format
 msgid "Graphic card: %s"
 msgstr "��ҿ�Ԥ����: %s"
 
-#: ../../Xconfigurator.pm_.c:713
+#: ../../Xconfigurator.pm_.c:813
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "��������� XFree86: %s"
 
-#: ../../Xconfigurator.pm_.c:729 ../../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 "Ẻ�������Ǫҭ (Expert)"
 
-#: ../../Xconfigurator.pm_.c:730
+#: ../../Xconfigurator.pm_.c:830
 msgid "Show all"
 msgstr "�ʴ������ŷ�����"
 
-#: ../../Xconfigurator.pm_.c:773
+#: ../../Xconfigurator.pm_.c:875
 msgid "Resolutions"
 msgstr "���������´"
 
-#: ../../Xconfigurator.pm_.c:1299
+#: ../../Xconfigurator.pm_.c:1437
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "���͡��Դ�ͧ�������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1300
+#: ../../Xconfigurator.pm_.c:1438
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "���͡��Դ�ͧ������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1301
+#: ../../Xconfigurator.pm_.c:1439
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "���ǫ�ͧ������: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1302
+#: ../../Xconfigurator.pm_.c:1440
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "���Ҿ: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1303
+#: ../../Xconfigurator.pm_.c:1441
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "�ѵ�Ҥ�������Ҵ����ǹ͹: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1304
+#: ../../Xconfigurator.pm_.c:1442
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "�ѵ�Ҥ�������Ҵ����ǵ��: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1305
+#: ../../Xconfigurator.pm_.c:1443
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "��ҿ�Ԥ����: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1306
+#: ../../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:1308
+#: ../../Xconfigurator.pm_.c:1447
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "ͤ��������´��: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1309
+#: ../../Xconfigurator.pm_.c:1448
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "���������´�ͧ�Ҿ %s\n"
 
-#: ../../Xconfigurator.pm_.c:1311
+#: ../../Xconfigurator.pm_.c:1450
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "��������� XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1312
+#: ../../Xconfigurator.pm_.c:1451
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "�������� XFree86: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1331
+#: ../../Xconfigurator.pm_.c:1469
 msgid "Preparing X-Window configuration"
 msgstr "�������ä͹�ԡ�ͧ X-Window"
 
-#: ../../Xconfigurator.pm_.c:1351
+#: ../../Xconfigurator.pm_.c:1489
 msgid "What do you want to do?"
 msgstr "�س��ͧ��èз�����?"
 
-#: ../../Xconfigurator.pm_.c:1356
+#: ../../Xconfigurator.pm_.c:1494
 msgid "Change Monitor"
 msgstr "����¹���Ҿ"
 
-#: ../../Xconfigurator.pm_.c:1357
+#: ../../Xconfigurator.pm_.c:1495
 msgid "Change Graphic card"
 msgstr "����¹��ҿ�Ԥ����"
 
-#: ../../Xconfigurator.pm_.c:1359
+#: ../../Xconfigurator.pm_.c:1497
 msgid "Change Server options"
 msgstr "����¹�ͻ��蹢ͧ���������"
 
-#: ../../Xconfigurator.pm_.c:1360
+#: ../../Xconfigurator.pm_.c:1498
 msgid "Change Resolution"
 msgstr "����¹��Ҵ���Ҿ"
 
-#: ../../Xconfigurator.pm_.c:1361
+#: ../../Xconfigurator.pm_.c:1499
 msgid "Show information"
 msgstr "�ʴ�������"
 
-#: ../../Xconfigurator.pm_.c:1362
+#: ../../Xconfigurator.pm_.c:1500
 msgid "Test again"
 msgstr "���ͺ�ա����"
 
-#: ../../Xconfigurator.pm_.c:1363 ../../bootlook.pm_.c:220
+#: ../../Xconfigurator.pm_.c:1501 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "�͡"
 
-#: ../../Xconfigurator.pm_.c:1371
+#: ../../Xconfigurator.pm_.c:1509
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -346,20 +358,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1392
+#: ../../Xconfigurator.pm_.c:1532
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "��س����价�� %s �ա��������������������¹�ŧ"
 
-#: ../../Xconfigurator.pm_.c:1412
+#: ../../Xconfigurator.pm_.c:1552
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "��س��͡������ Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1415
+#: ../../Xconfigurator.pm_.c:1555
 msgid "X at startup"
 msgstr "����繡�ҿ�Ԥ������������"
 
-#: ../../Xconfigurator.pm_.c:1416
+#: ../../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?"
@@ -412,215 +424,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 �����ҡ����"
 
-#: ../../Xconfigurator_consts.pm_.c:120
+#: ../../Xconfigurator_consts.pm_.c:122
 msgid "Standard VGA, 640x480 at 60 Hz"
 msgstr "���Ҿ�ը���Ẻ�ҵðҹ 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 interlaced (����� 800x600)"
+msgstr "���᾵����šѺ 8514 ��Ҵ 1024x768 ��� 87 Hz interlaced (����� 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:196
+#: ../../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 "LILO Ẻ text menu"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:128 ../../any.pm_.c:139
 msgid "LILO with graphical menu"
 msgstr "LILO Ẻ graphical menu"
 
-#: ../../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 "Boot �ҡ 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:179
+#: ../../any.pm_.c:145 ../../any.pm_.c:177
 msgid "Bootloader main options"
 msgstr "��ͻ�����ѡ�ͧ Bootloader"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:180
+#: ../../any.pm_.c:146 ../../any.pm_.c:178
 msgid "Bootloader to use"
 msgstr "Bootloader ������"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:148
 msgid "Bootloader installation"
 msgstr "��õԴ��� Bootloader"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:182
+#: ../../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 (doesn't work on old BIOSes)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "Compact"
 msgstr "Ẻ�Ѵ (Compact)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:152
 msgid "compact"
 msgstr "Ẻ�Ѵ (compact)"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:255
+#: ../../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:737
-#: ../../install_steps_interactive.pm_.c:904 ../../netconnect.pm_.c:627
-#: ../../printerdrake.pm_.c:98 ../../printerdrake.pm_.c:132
-#: ../../standalone/draknet_.c:567
+#: ../../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:738
-#: ../../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 �͹ boot �ء����"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:162
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "��˹����˹��¤����� (RAM) ���١��ͧ��ҵ�ͧ��� (�к��� %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:164
 msgid "Enable multi profiles"
 msgstr "Enable multi 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:714
-#: ../../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:714
-#: ../../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:181
+#: ../../any.pm_.c:179
 msgid "Init Message"
 msgstr "��ͤ��� init"
 
-#: ../../any.pm_.c:183
+#: ../../any.pm_.c:181
 msgid "Open Firmware Delay"
 msgstr "Open Firmware Delay"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:182
 msgid "Kernel Boot Timeout"
 msgstr "Kernel Boot Timeout"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:183
 msgid "Enable CD Boot?"
 msgstr "Enable CD Boot?"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:184
 msgid "Enable OF Boot?"
 msgstr "Enable OF Boot?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:185
 msgid "Default OS?"
 msgstr "Default OS?"
 
-#: ../../any.pm_.c:209
+#: ../../any.pm_.c:207
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -628,146 +650,145 @@ msgstr ""
 "���仹���繢����ŵ�ҧ�\n"
 "�س����ö����������������䢢����ŷ������"
 
-#: ../../any.pm_.c:219 ../../printerdrake.pm_.c:356
+#: ../../any.pm_.c:217
 msgid "Add"
 msgstr "����"
 
-#: ../../any.pm_.c:219 ../../any.pm_.c:725 ../../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:219
+#: ../../any.pm_.c:217
 #, fuzzy
 msgid "Modify"
 msgstr "��� RAID"
 
-#: ../../any.pm_.c:227
+#: ../../any.pm_.c:225
 msgid "Which type of entry do you want to add?"
 msgstr "�����Ż�����㴷��س��ͧ�������"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:226
 msgid "Linux"
 msgstr "�չء��"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:226
 msgid "Other OS (SunOS...)"
 msgstr "�к���Ժѵԡ������ (SunOS...)"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:227
 msgid "Other OS (MacOS...)"
 msgstr "�к���Ժѵԡ������ (Mac OS...)"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:227
 msgid "Other OS (windows...)"
 msgstr "�к���Ժѵԡ������ (�Թ����...)"
 
-#: ../../any.pm_.c:249 ../../any.pm_.c:251
+#: ../../any.pm_.c:246
 msgid "Image"
 msgstr "Image"
 
-#: ../../any.pm_.c:252 ../../any.pm_.c:263
+#: ../../any.pm_.c:247 ../../any.pm_.c:258
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:253 ../../any.pm_.c:282
+#: ../../any.pm_.c:248 ../../any.pm_.c:277
 msgid "Append"
 msgstr "Append"
 
-#: ../../any.pm_.c:257
+#: ../../any.pm_.c:252
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:253
 msgid "Read-write"
 msgstr "Read-write"
 
-#: ../../any.pm_.c:265
+#: ../../any.pm_.c:260
 msgid "Table"
 msgstr "Table"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:261
 msgid "Unsafe"
 msgstr "Unsafe"
 
-#: ../../any.pm_.c:273 ../../any.pm_.c:278 ../../any.pm_.c:281
+#: ../../any.pm_.c:268 ../../any.pm_.c:273 ../../any.pm_.c:276
 msgid "Label"
 msgstr "Label"
 
-#: ../../any.pm_.c:275 ../../any.pm_.c:286
+#: ../../any.pm_.c:270 ../../any.pm_.c:281
 msgid "Default"
 msgstr "Default"
 
-#: ../../any.pm_.c:283
+#: ../../any.pm_.c:278
 msgid "Initrd-size"
 msgstr "Initrd-size"
 
-#: ../../any.pm_.c:285
+#: ../../any.pm_.c:280
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: ../../any.pm_.c:293
+#: ../../any.pm_.c:288
 msgid "Remove entry"
 msgstr "ź������"
 
-#: ../../any.pm_.c:296
+#: ../../any.pm_.c:291
 msgid "Empty label not allowed"
 msgstr "���͹حҵ�������Ǣ����ҧ"
 
-#: ../../any.pm_.c:297
+#: ../../any.pm_.c:292
 msgid "This label is already used"
 msgstr "��Ǣ�͹��١������º��������"
 
-#: ../../any.pm_.c:316
-msgid "What type of partitioning?"
-msgstr "��÷� partitioning ��Դ�?"
-
-#: ../../any.pm_.c:604
+#: ../../any.pm_.c:597
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "��Ǩ�� %s �Թ������ %s"
 
-#: ../../any.pm_.c:605
+#: ../../any.pm_.c:598
 msgid "Do you have another one?"
 msgstr "�س���ѹ�����ա�������?"
 
-#: ../../any.pm_.c:606
+#: ../../any.pm_.c:599
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "�س���Թ������ %s �ӹǹ�������?"
 
-#: ../../any.pm_.c:608 ../../interactive.pm_.c:100 ../../my_gtk.pm_.c:615
-#: ../../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:608 ../../interactive.pm_.c:100 ../../my_gtk.pm_.c:615
+#: ../../any.pm_.c:601 ../../any.pm_.c:759 ../../interactive.pm_.c:112
+#: ../../my_gtk.pm_.c:715
 msgid "Yes"
 msgstr "��"
 
-#: ../../any.pm_.c:609
+#: ../../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:644
+#: ../../any.pm_.c:637
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "�Դ��������������Ѻ %s ���� %s"
 
-#: ../../any.pm_.c:645
+#: ../../any.pm_.c:638
 #, c-format
 msgid "(module %s)"
 msgstr "(����� %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:656
+#: ../../any.pm_.c:649
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "��ͧ��������������ͧ��������� %s ��Դ�?"
 
-#: ../../any.pm_.c:664
+#: ../../any.pm_.c:657
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -784,20 +805,20 @@ msgstr ""
 "��Ǩ�Ң����ŷ����繵�ͧ��? 㹺ҧ�óա�õ�Ǩ���Ҩ���������������Χ��\n"
 "���������ѹ���¡Ѻ����������"
 
-#: ../../any.pm_.c:669
+#: ../../any.pm_.c:662
 msgid "Autoprobe"
 msgstr "��Ǩ���ѵ��ѵ�"
 
-#: ../../any.pm_.c:669
+#: ../../any.pm_.c:662
 msgid "Specify options"
 msgstr "�к���ͻ���"
 
-#: ../../any.pm_.c:673
+#: ../../any.pm_.c:666
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "�س����ö��͹��������ͻ������Ѻ����� %s ������"
 
-#: ../../any.pm_.c:679
+#: ../../any.pm_.c:672
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -808,11 +829,11 @@ msgstr ""
 "��ͻ��蹨�������ٻẺ ``name=value name2=value2 ...''\n"
 "������ҧ��, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:682
+#: ../../any.pm_.c:675
 msgid "Module options:"
 msgstr "��ͻ��蹢ͧ�����:"
 
-#: ../../any.pm_.c:693
+#: ../../any.pm_.c:686
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -821,33 +842,33 @@ msgstr ""
 "�����Ŵ����� %s �������\n"
 "�س��ͧ�����鷴�ͧ�ա���駴��¾��������������ա�������?"
 
-#: ../../any.pm_.c:711
+#: ../../any.pm_.c:704
 #, c-format
 msgid "(already added %s)"
 msgstr "(���� %s ���º��������)"
 
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:708
 msgid "This password is too simple"
 msgstr "���ʼ�ҹ�����µ�͡����"
 
-#: ../../any.pm_.c:716
+#: ../../any.pm_.c:709
 msgid "Please give a user name"
 msgstr "�ô��͹���ͼ����"
 
-#: ../../any.pm_.c:717
+#: ../../any.pm_.c:710
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "���ͼ���������ö����੾�е���ѡ�õ����� ����Ţ '-' ��� '_'"
 
-#: ../../any.pm_.c:718
+#: ../../any.pm_.c:711
 msgid "This user name is already added"
 msgstr "���ͼ��������١����ŧ���к����º��������"
 
-#: ../../any.pm_.c:722
+#: ../../any.pm_.c:715
 msgid "Add user"
 msgstr "���������"
 
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:716
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -856,53 +877,66 @@ msgstr ""
 "����������\n"
 "%s"
 
-#: ../../any.pm_.c:724
+#: ../../any.pm_.c:717
 msgid "Accept user"
 msgstr "����Ѻ�����"
 
-#: ../../any.pm_.c:735
+#: ../../any.pm_.c:728
 msgid "Real name"
 msgstr "�������"
 
-#: ../../any.pm_.c:736 ../../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:739
+#: ../../any.pm_.c:732
 msgid "Shell"
 msgstr "��������"
 
-#: ../../any.pm_.c:741
+#: ../../any.pm_.c:734
 msgid "Icon"
 msgstr "Icon"
 
-#: ../../any.pm_.c:762
+#: ../../any.pm_.c:756
 msgid "Autologin"
 msgstr "Autologin"
 
-#: ../../any.pm_.c:763
+#: ../../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"
 "��Ҥس����ͧ�����ҹ�ٻẺ����سҡ�����¡��ԡ"
 
-#: ../../any.pm_.c:765
+#: ../../any.pm_.c:761
 msgid "Choose the default user:"
 msgstr "���͡����� default"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:762
 msgid "Choose the window manager to run:"
 msgstr "���͡ window manager:"
 
+#: ../../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:259
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -926,41 +960,57 @@ 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)
-#: ../../bootloader.pm_.c:795
+#. -PO: and keep them smaller than 79 chars long
+#: ../../bootloader.pm_.c:835
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "�Թ�յ�͹�Ѻ��� GRUB the operating system chooser!"
 
-#: ../../bootloader.pm_.c:796
+#. -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:838
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "�� %c ��� %c �������͡."
 
-#: ../../bootloader.pm_.c:797
+#. -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:841
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "��سҡ� enter �к�����ͧ��� 'e' ��������¹�ŧ "
 
-#: ../../bootloader.pm_.c:798
+#. -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:844
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "����觡�͹ boot, ���� 'c' ��ҵ�ͧ��� command-line."
 
-#: ../../bootloader.pm_.c:799
+#. -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:847
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "OS ���١���͡�зӡ�� boot � %d �Թҷ�"
 
-#: ../../bootloader.pm_.c:803
+#: ../../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
-#: ../../bootloader.pm_.c:895
+#. -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:951
 msgid "Desktop"
 msgstr "Desktop"
 
-#: ../../bootloader.pm_.c:895
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../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 "no help implemented yet.\n"
@@ -973,68 +1023,40 @@ msgstr "Boot Style Configuration"
 msgid "/_File"
 msgstr "/_���"
 
-#: ../../bootlook.pm_.c:81
-msgid "/File/_New"
-msgstr "/���/_����"
-
-#: ../../bootlook.pm_.c:82
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:84
-msgid "/File/_Open"
-msgstr "/���/_�Դ"
-
-#: ../../bootlook.pm_.c:85
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:87
-msgid "/File/_Save"
-msgstr "/���/_�ѹ�֡"
-
-#: ../../bootlook.pm_.c:88
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/Save _As"
-msgstr "/���/_�ѹ�֡��"
-
-#: ../../bootlook.pm_.c:91
-msgid "/File/-"
-msgstr "/���/-"
-
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "/File/_Quit"
 msgstr "/���/_��ԡ"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:96
-msgid "/_Options"
-msgstr "/_Options"
+#: ../../bootlook.pm_.c:91
+msgid "NewStyle Categorizing Monitor"
+msgstr "NewStyle Categorizing Monitor"
 
-#: ../../bootlook.pm_.c:98
-msgid "/Options/Test"
-msgstr "/Options/���ͧ"
+#: ../../bootlook.pm_.c:92
+msgid "NewStyle Monitor"
+msgstr "���Ҿ��Դ����"
+
+#: ../../bootlook.pm_.c:93
+msgid "Traditional Monitor"
+msgstr "���Ҿ�����"
 
-#: ../../bootlook.pm_.c:99
-msgid "/_Help"
-msgstr "/_���������"
+#: ../../bootlook.pm_.c:94
+msgid "Traditional Gtk+ Monitor"
+msgstr "Gtk+ Monitor �����"
 
-#: ../../bootlook.pm_.c:101
-msgid "/Help/_About..."
-msgstr "/���������/_About..."
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
+msgstr "�ѹ Aurora ��� boot"
 
-#: ../../bootlook.pm_.c:111 ../../standalone/drakgw_.c:634
-#: ../../standalone/draknet_.c:262 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "��û�Ѻ��"
+#: ../../bootlook.pm_.c:100
+#, fuzzy
+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"
@@ -1046,562 +1068,535 @@ msgstr ""
 "\n"
 "�� ``Ok'' ��Ҥس��ͧ����������÷ӧҹ�ͧ setup wizard"
 
-#: ../../bootlook.pm_.c:121
-#, fuzzy
-msgid "Lilo/grub mode"
-msgstr "�����ع���Ѿ����������"
-
-#: ../../bootlook.pm_.c:131
-msgid "NewStyle Categorizing Monitor"
-msgstr "NewStyle Categorizing Monitor"
-
-#: ../../bootlook.pm_.c:134
-msgid "NewStyle Monitor"
-msgstr "���Ҿ��Դ����"
-
-#: ../../bootlook.pm_.c:137
-msgid "Traditional Monitor"
-msgstr "���Ҿ�����"
-
-#: ../../bootlook.pm_.c:140
-msgid "Traditional Gtk+ Monitor"
-msgstr "Gtk+ Monitor �����"
-
-#: ../../bootlook.pm_.c:144
-msgid "Launch Aurora at boot time"
-msgstr "�ѹ Aurora ��� boot"
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:280 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "��û�Ѻ��"
 
-#: ../../bootlook.pm_.c:169
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Boot mode"
 
-#: ../../bootlook.pm_.c:179
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "System mode"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "�ѹ X-Window �����������ӧҹ"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "����ͧ��� autologin"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "������ ����ͧ��� autologin ����Ѻ�������¹��"
 
-#: ../../bootlook.pm_.c:210
-msgid "System mode"
-msgstr "System mode"
-
-#: ../../bootlook.pm_.c:218 ../../standalone/draknet_.c:88
-#: ../../standalone/draknet_.c:120 ../../standalone/draknet_.c:184
-#: ../../standalone/draknet_.c:302 ../../standalone/draknet_.c:394
-#: ../../standalone/draknet_.c:471 ../../standalone/draknet_.c:507
-#: ../../standalone/draknet_.c:609
+#: ../../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:220 ../../install_steps_gtk.pm_.c:576
-#: ../../interactive.pm_.c:110 ../../interactive.pm_.c:265
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:357
-#: ../../my_gtk.pm_.c:360 ../../my_gtk.pm_.c:616
-#: ../../standalone/drakgw_.c:639 ../../standalone/draknet_.c:95
-#: ../../standalone/draknet_.c:127 ../../standalone/draknet_.c:295
-#: ../../standalone/draknet_.c:483 ../../standalone/draknet_.c:623
-#: ../../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:297
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "�������ö�Դ /etc/inittab ����ҹ��: $!"
-
-#: ../../bootlook.pm_.c:351
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "�������ö�Դ /etc/sysconfig/autologin ����ҹ��: $!"
+#: ../../bootlook.pm_.c:224
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "�������ö�Դ /etc/inittab ����ҹ��: %s"
 
-#: ../../bootlook.pm_.c:416 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:336 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "��õԴ��� LILO ������� ���仹���繢�ͼԴ��Ҵ����Դ���"
 
-#: ../../common.pm_.c:634
+#: ../../common.pm_.c:93
 msgid "GB"
 msgstr "GB"
 
-#: ../../common.pm_.c:634
+#: ../../common.pm_.c:93
 msgid "KB"
 msgstr "KB"
 
-#: ../../common.pm_.c:634 ../../diskdrake.pm_.c:660
-#: ../../install_steps_graphical.pm_.c:287
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334
 msgid "MB"
 msgstr "MB"
 
-#: ../../common.pm_.c:642
+#: ../../common.pm_.c:101
 msgid "TB"
 msgstr "TB"
 
-#: ../../common.pm_.c:655
+#: ../../common.pm_.c:109
 #, c-format
 msgid "%d minutes"
 msgstr "%d �ҷ�"
 
-#: ../../common.pm_.c:657
+#: ../../common.pm_.c:111
 msgid "1 minute"
 msgstr "1 �ҷ�"
 
-#: ../../common.pm_.c:659
+#: ../../common.pm_.c:113
 #, c-format
 msgid "%d seconds"
 msgstr "%d �Թҷ�"
 
-#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:462
-msgid "Create"
-msgstr "���ҧ"
-
-#: ../../diskdrake.pm_.c:22
-msgid "Unmount"
-msgstr "��ԡ���ҷ���к����"
-
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:464
-msgid "Delete"
-msgstr "ź"
-
-#: ../../diskdrake.pm_.c:23
-msgid "Format"
-msgstr "�������"
-
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:653
-msgid "Resize"
-msgstr "����¹��Ҵ"
-
-#: ../../diskdrake.pm_.c:23 ../../diskdrake.pm_.c:462
-#: ../../diskdrake.pm_.c:518
-msgid "Type"
-msgstr "������"
-
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:539
-msgid "Mount point"
-msgstr "��˹��ش���ҷ�"
-
-#: ../../diskdrake.pm_.c:38
-msgid "Write /etc/fstab"
-msgstr "��¹ŧ� /etc/fstab"
-
-#: ../../diskdrake.pm_.c:39
-msgid "Toggle to expert mode"
-msgstr "���� > ����Ѻ���ӹҭ"
+#: ../../diskdrake.pm_.c:100
+msgid "Please make a backup of your data first"
+msgstr "��سҷ� backup ��͹"
 
-#: ../../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 sectors) \n"
+"��ҹ˹�Ңͧ disk"
 
-#: ../../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 "Wizard"
 
-#: ../../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:209
+#, fuzzy
+msgid "Options"
+msgstr "/Options/���ͧ"
 
-#: ../../diskdrake.pm_.c:54
-msgid "Format all"
-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:55
-msgid "Auto allocate"
-msgstr "��˹�Ẻ�ѵ��ѵ�"
+#: ../../diskdrake.pm_.c:223 ../../diskdrake_interactive.pm_.c:361
+msgid "Unmount"
+msgstr "��ԡ���ҷ���к����"
 
-#: ../../diskdrake.pm_.c:59
-msgid "All primary partitions are used"
-msgstr "����Ԫ��Ẻ primary �١�����������"
+#: ../../diskdrake.pm_.c:224 ../../diskdrake_interactive.pm_.c:357
+msgid "Mount"
+msgstr "���ҷ�"
 
-#: ../../diskdrake.pm_.c:59
-msgid "I can't add any more partition"
-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 ""
-"�ҡ��ͧ�����������Ԫ�� �ôź����Ԫ�蹷��˹�觾���Ԫ���������ҧ\n"
-"����Ԫ��Ẻ extended ��"
+"��Ҥس�� ����Ԫ�� FAT ����˭� ����Ԫ�� ����\n"
+"(����»��� Microsoft Dos/Windows ��)\n"
+"���й����س��Ѻ��Ҵ ����Ԫ�� ���¡�͹\n"
+"(������ѹ���ǡ� \"��Ѻ��Ҵ\")"
 
-#: ../../diskdrake.pm_.c:61
-msgid "Not enough space for auto-allocating"
-msgstr "����վ�鹷����§������Ѻ������Ѵ��ǹ����Ԫ��Ẻ����"
+#: ../../diskdrake.pm_.c:238
+msgid "Please click on a partition"
+msgstr "�ô���͡����Ԫ��"
 
-#: ../../diskdrake.pm_.c:63
-msgid "Undo"
-msgstr "¡��ԡ"
+#: ../../diskdrake.pm_.c:240
+#, fuzzy
+msgid "Please click on a media"
+msgstr "�ô���͡����Ԫ��"
 
-#: ../../diskdrake.pm_.c:64
-msgid "Write partition table"
-msgstr "�ѹ�֡���ҧ����Ԫ��"
+#: ../../diskdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Please click on a button above\n"
+"\n"
+"Or use \"New\""
+msgstr "�ô���͡����Ԫ��"
 
-#: ../../diskdrake.pm_.c:65 ../../install_steps_interactive.pm_.c:185
-msgid "More"
-msgstr "More"
+#: ../../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 "��������´"
+
+#: ../../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 "��ͻ"
 
-#: ../../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: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 ""
-"��Ҥس�� ����Ԫ�� FAT ����˭� ����Ԫ�� ����\n"
-"(����»��� Microsoft Dos/Windows ��)\n"
-"���й����س��Ѻ��Ҵ ����Ԫ�� ���¡�͹\n"
-"(������ѹ���ǡ� \"��Ѻ��Ҵ\")"
+#: ../../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 "��سҷ� backup ��͹"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake_interactive.pm_.c:362
+msgid "Delete"
+msgstr "ź"
 
-#: ../../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:423
+msgid "Use ``Unmount'' first"
+msgstr "�� ``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 "�س��ͧ������ҷ��ػ�ó� %s ������?"
+
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Mount options"
+msgstr "��ͻ��蹢ͧ�����:"
+
+#: ../../diskdrake.pm_.c:507
+msgid "Various"
 msgstr ""
-"��Ҥس��ͧ����� aboot ������ѧ��ҵ�ͧ�շ����ҧ (2048 sectors) \n"
-"��ҹ˹�Ңͧ disk"
 
-#: ../../diskdrake.pm_.c:170
-msgid "Be careful: this operation is dangerous."
-msgstr "���ѧ ��÷ӧҹ����ѹ����"
+#: ../../diskdrake.pm_.c:525
+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 "�س��ͧ������͡ filesystem �"
 
-#: ../../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 "�ѡ������Ẻ���: %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 file(s): %s\n"
+#: ../../diskdrake_interactive.pm_.c:210
+msgid "Undo"
+msgstr "¡��ԡ"
+
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Continue anyway?"
+msgstr "�ӧҹ����������?"
 
-#: ../../diskdrake.pm_.c:265
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without saving"
+msgstr "�͡������ͧ�ѹ�֡"
+
+#: ../../diskdrake_interactive.pm_.c:234
+msgid "Quit without writing the partition table?"
+msgstr "�͡������ͧ��¹���ҧ����Ԫ��"
+
+#: ../../diskdrake_interactive.pm_.c:237
+#, fuzzy
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "�س��ͧ��÷��ͺ��ä͹�ԡ�������"
+
+#: ../../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 "More"
+
+#: ../../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 "����Ԫ��Ẻ primary �١�����������"
+
+#: ../../diskdrake_interactive.pm_.c:274
+msgid "I can't add any more partition"
+msgstr "������������ö��������Ԫ�����ա"
+
+#: ../../diskdrake_interactive.pm_.c:275
 msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
-"����Ԫ�蹷���˹����ٵ��觡�˹��������\n"
-"    (����Ѻ�ٵ�ͧ MS-DOS ����� lilo)\n"
+"�ҡ��ͧ�����������Ԫ�� �ôź����Ԫ�蹷��˹�觾���Ԫ���������ҧ\n"
+"����Ԫ��Ẻ extended ��"
 
-#: ../../diskdrake.pm_.c:267
-#, c-format
-msgid "Level %s\n"
-msgstr "�дѺ %s\n"
+#: ../../diskdrake_interactive.pm_.c:285
+#, fuzzy
+msgid "Save partition table"
+msgstr "�ѹ�֡���ҧ����Ԫ��"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "��Ҵ�ͧ Chunk %s\n"
+#: ../../diskdrake_interactive.pm_.c:286
+#, fuzzy
+msgid "Restore partition table"
+msgstr "�����ҧ����Ԫ��"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "��ʡ�Ẻ RAID %s\n"
+#: ../../diskdrake_interactive.pm_.c:287
+msgid "Rescue partition table"
+msgstr "�����ҧ����Ԫ��"
 
-#: ../../diskdrake.pm_.c:271
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Loopback file name: %s"
+#: ../../diskdrake_interactive.pm_.c:289
+#, fuzzy
+msgid "Reload partition table"
+msgstr "�����ҧ����Ԫ��"
 
-#: ../../diskdrake.pm_.c:274
-msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+#: ../../diskdrake_interactive.pm_.c:293
+msgid "Removable media automounting"
 msgstr ""
-"\n"
-"�դ�������������Ԫ�蹹��\n"
-"�繾���Ԫ�蹢ͧ������� �س��÷���\n"
-"������ѹ������Ẻ���\n"
 
-#: ../../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 ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"����Ԫ�����Ѿ����բ�Ҵ��ҡѹ\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-disks %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 "����� %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.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 ���ÿ� (����բ�Ҵ��Թ�����ҡ���� "
-"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 ""
-"����Ԫ�蹷��س���͡����� root (/) �ա�á�˹��ҧ����Ҿ����բ�Ҵ�Թ\n"
-"��Թ������ 1024 �ͧ���촴�ʡ� ��Фس����վ���Ԫ�� /boot\n"
-"��Ҥس��ͧ����� LILO �繺ٵ������� �ô���Ѵ���ѧ㹡����������Ԫ�� "
-"/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 ""
-"�س�����͡ Software RAID ����Ԫ�� �� root (/) \n"
-"bootloader �������ö�ӧҹ������� /boot ����Ԫ�� \n"
-"���Щ��鹨��繵�ͧ���� /boot ����Ԫ��"
+#: ../../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 "�� ``Unmount'' ��͹"
+#: ../../diskdrake_interactive.pm_.c:414 ../../diskdrake_interactive.pm_.c:732
+msgid "Size in MB: "
+msgstr "��Ҵ�� MB: "
 
-#: ../../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 "�������ͧ�к����: "
 
-#: ../../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 "�ش���ҷ�: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without saving"
-msgstr "�͡������ͧ�ѹ�֡"
+#: ../../diskdrake_interactive.pm_.c:420
+msgid "Preference: "
+msgstr "��͡�˹�: "
 
-#: ../../diskdrake.pm_.c:486
-msgid "Quit without writing the partition table?"
-msgstr "�͡������ͧ��¹���ҧ����Ԫ��"
+#: ../../diskdrake_interactive.pm_.c:462
+#, fuzzy
+msgid "Remove the loopback file?"
+msgstr "������� loopback file %s"
 
-#: ../../diskdrake.pm_.c:516
+#: ../../diskdrake_interactive.pm_.c:486
 msgid "Change partition type"
 msgstr "����¹����������Ԫ��"
 
-#: ../../diskdrake.pm_.c:517
-msgid "Which filesystem do you want?"
-msgstr "�س��ͧ������͡ filesystem �"
-
-#: ../../diskdrake.pm_.c:520 ../../diskdrake.pm_.c:780
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "�س�������ö�� ReiserFS ����Ѻ����Ԫ�蹷����¡��� 32MB ��"
+#: ../../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 "�س��ͧ������ҷ� loopback file %s ������?"
 
-#: ../../diskdrake.pm_.c:538
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "�س��ͧ������ҷ��ػ�ó� %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"
@@ -1609,215 +1604,383 @@ msgstr ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 
-#: ../../diskdrake.pm_.c:561
-#, c-format
-msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "��ѧ�ҡ format ����Ԫ�� %s �����ŷ�����㹾���Ԫ�蹹��ж١ź���"
+#: ../../diskdrake_interactive.pm_.c:549
+msgid "Computing FAT filesystem bounds"
+msgstr "�ӹǳ�ͺࢵ�ͧ�к����"
 
-#: ../../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 "������� loopback file %s"
+#: ../../diskdrake_interactive.pm_.c:578
+msgid "This partition is not resizeable"
+msgstr "����Ԫ�蹹���������ö����¹��Ҵ��"
 
-#: ../../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 "�����ŷ�����㹾���Ԫ�蹹���èзӡ�����ͧ���"
 
-#: ../../diskdrake.pm_.c:570
-msgid "After formatting all partitions,"
-msgstr "��ѧ�ҡ��������ء����Ԫ��"
+#: ../../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 "��Ҵ�� MB: "
 
-#: ../../diskdrake.pm_.c:577
+#: ../../diskdrake_interactive.pm_.c:631
 msgid "Which disk do you want to move it to?"
 msgstr "�س��ͧ��è�����仴�ʡ��˹"
 
-#: ../../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 "�س��ͧ���������������˹"
 
-#: ../../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 "���͡ 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_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 file: "
+
+#: ../../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 "File already used by another loopback, choose another one"
+
+#: ../../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"
+"Either you use LILO and it won't work, or you don't use LILO and you don't "
+"need /boot"
+msgstr ""
+"������ ������������ö���ҧ /boot ���ÿ� (����բ�Ҵ��Թ�����ҡ���� 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 ""
+"����Ԫ�蹷��س���͡����� root (/) �ա�á�˹��ҧ����Ҿ����բ�Ҵ�Թ\n"
+"��Թ������ 1024 �ͧ���촴�ʡ� ��Фس����վ���Ԫ�� /boot\n"
+"��Ҥس��ͧ����� LILO �繺ٵ������� �ô���Ѵ���ѧ㹡����������Ԫ�� /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 ""
+"�س�����͡ Software RAID ����Ԫ�� �� root (/) \n"
+"bootloader �������ö�ӧҹ������� /boot ����Ԫ�� \n"
+"���Щ��鹨��繵�ͧ���� /boot ����Ԫ��"
+
+#: ../../diskdrake_interactive.pm_.c:864
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "���ҧ����Ԫ�蹢ͧ�ÿ� %s �ж١�ѹ�֡ŧ�㹴�ʡ�"
 
-#: ../../diskdrake.pm_.c:594
+#: ../../diskdrake_interactive.pm_.c:868
 msgid "You'll need to reboot before the modification can take place"
 msgstr "�س�е�ͧ�ӡ���պٵ�к���͹���зӡ�����"
 
-#: ../../diskdrake.pm_.c:615
-msgid "Computing FAT filesystem bounds"
-msgstr "�ӹǳ�ͺࢵ�ͧ�к����"
+#: ../../diskdrake_interactive.pm_.c:879
+#, c-format
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr "��ѧ�ҡ format ����Ԫ�� %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
-msgid "This partition is not resizeable"
-msgstr "����Ԫ�蹹���������ö����¹��Ҵ��"
+#: ../../diskdrake_interactive.pm_.c:882
+#, c-format
+msgid "Formatting loopback file %s"
+msgstr "������� loopback file %s"
 
-#: ../../diskdrake.pm_.c:648
-msgid "All data on this partition should be backed-up"
-msgstr "�����ŷ�����㹾���Ԫ�蹹���èзӡ�����ͧ���"
+#: ../../diskdrake_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:419
+#, c-format
+msgid "Formatting partition %s"
+msgstr "�����������Ԫ�� %s"
 
-#: ../../diskdrake.pm_.c:650
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Hide files"
+msgstr "mkraid failed"
+
+#: ../../diskdrake_interactive.pm_.c:894
+#, fuzzy
+msgid "Move files to the new partition"
+msgstr "����վ�鹷����§������Ѻ ����Ԫ�� ����"
+
+#: ../../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:714
-msgid "Create a new partition"
-msgstr "���ҧ����Ԫ������"
+#: ../../diskdrake_interactive.pm_.c:910
+#, c-format
+msgid "Copying %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:740
-msgid "Start sector: "
-msgstr "�����������: "
+#: ../../diskdrake_interactive.pm_.c:914
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "���������´�ͧ�Ҿ %s\n"
 
-#: ../../diskdrake.pm_.c:744 ../../diskdrake.pm_.c:819
-msgid "Size in MB: "
-msgstr "��Ҵ�� MB: "
+#: ../../diskdrake_interactive.pm_.c:937 ../../diskdrake_interactive.pm_.c:996
+msgid "Device: "
+msgstr "�ػ�ó�: "
 
-#: ../../diskdrake.pm_.c:747 ../../diskdrake.pm_.c:822
-msgid "Filesystem type: "
-msgstr "�������ͧ�к����: "
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "�ѡ������Ẻ���: %s (�繡�äҴ��)\n"
 
-#: ../../diskdrake.pm_.c:750
-msgid "Preference: "
-msgstr "��͡�˹�: "
+#: ../../diskdrake_interactive.pm_.c:942 ../../diskdrake_interactive.pm_.c:950
+#: ../../diskdrake_interactive.pm_.c:1014
+msgid "Type: "
+msgstr "������: "
 
-#: ../../diskdrake.pm_.c:798
-msgid "This partition can't be used for loopback"
-msgstr "����Ԫ�蹹���������ö��Ѻ loopback"
+#: ../../diskdrake_interactive.pm_.c:946
+msgid "Name: "
+msgstr "����: "
 
-#: ../../diskdrake.pm_.c:808
-msgid "Loopback"
-msgstr "Loopback"
+#: ../../diskdrake_interactive.pm_.c:954
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "�������: ������ %s\n"
 
-#: ../../diskdrake.pm_.c:818
-msgid "Loopback file name: "
-msgstr "���� Loopback file: "
+#: ../../diskdrake_interactive.pm_.c:955
+#, c-format
+msgid "Size: %s"
+msgstr "��Ҵ: %s"
 
-#: ../../diskdrake.pm_.c:844
-msgid "File already used by another loopback, choose another one"
-msgstr "File already used by another loopback, choose another one"
+#: ../../diskdrake_interactive.pm_.c:957
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s ������"
 
-#: ../../diskdrake.pm_.c:845
-msgid "File already exists. Use it?"
-msgstr "������������� ��ͧ�����?"
+#: ../../diskdrake_interactive.pm_.c:959
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "��Թ���� %d �� ��Թ���� %d\n"
 
-#: ../../diskdrake.pm_.c:867 ../../diskdrake.pm_.c:883
-msgid "Select file"
-msgstr "���͡���"
+#: ../../diskdrake_interactive.pm_.c:960
+msgid "Formatted\n"
+msgstr "�������\n"
 
-#: ../../diskdrake.pm_.c:876
-msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
-msgstr ""
-"����Ԫ�����Ѿ����բ�Ҵ��ҡѹ\n"
-"��ͧ��÷ӵ���������?"
+#: ../../diskdrake_interactive.pm_.c:961
+msgid "Not formatted\n"
+msgstr "�ѧ�����������\n"
 
-#: ../../diskdrake.pm_.c:884
-msgid "Warning"
-msgstr "����͹"
+#: ../../diskdrake_interactive.pm_.c:962
+msgid "Mounted\n"
+msgstr "���ҷ�\n"
+
+#: ../../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 "Loopback file(s): %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:966
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
-"��س�����蹿��ͻ��������\n"
-"�����ŷ��������蹿��ͻ���ж١ź"
+"����Ԫ�蹷���˹����ٵ��觡�˹��������\n"
+"    (����Ѻ�ٵ�ͧ MS-DOS ����� lilo)\n"
 
-#: ../../diskdrake.pm_.c:896
-msgid "Trying to rescue partition table"
-msgstr "���ѧ�����������ҧ����Ԫ�蹤׹"
+#: ../../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 "��Ҵ�ͧ Chunk %s\n"
 
-#: ../../diskdrake.pm_.c:906
-msgid "level"
-msgstr "�дѺ"
+#: ../../diskdrake_interactive.pm_.c:970
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "��ʡ�Ẻ RAID %s\n"
 
-#: ../../diskdrake.pm_.c:907
-msgid "chunk size"
-msgstr "��Ҵ�ͧ chunk"
+#: ../../diskdrake_interactive.pm_.c:972
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Loopback file name: %s"
 
-#: ../../diskdrake.pm_.c:919
-msgid "Choose an existing RAID to add to"
-msgstr "���͡ 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 ""
+"\n"
+"�դ�������������Ԫ�蹹��\n"
+"�繾���Ԫ�蹢ͧ������� �س��÷���\n"
+"������ѹ������Ẻ���\n"
 
-#: ../../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 ""
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 
-#: ../../diskdrake.pm_.c:944
-msgid "Choose an existing LVM to add to"
-msgstr "���͡ LVM ���������������������"
+#: ../../diskdrake_interactive.pm_.c:997
+#, c-format
+msgid "Size: %s\n"
+msgstr "��Ҵ: %s\n"
 
-#: ../../diskdrake.pm_.c:949
-msgid "LVM name?"
-msgstr "���� LVM"
+#: ../../diskdrake_interactive.pm_.c:998
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "�����ŷҧ����Ҿ: %s ��Թ����, %s �����ҹ, %s ������\n"
 
-#: ../../diskdrake.pm_.c:976
-msgid "Removable media automounting"
-msgstr ""
+#: ../../diskdrake_interactive.pm_.c:999
+msgid "Info: "
+msgstr "������: "
 
-#: ../../diskdrake.pm_.c:977
-msgid "Rescue partition table"
-msgstr "�����ҧ����Ԫ��"
+#: ../../diskdrake_interactive.pm_.c:1000
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-disks %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:1001
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "��Դ���ҧ����Ԫ��: %s\n"
 
-#: ../../diskdrake.pm_.c:979
-msgid "Reload"
-msgstr "���¡�׹�ա����"
+#: ../../diskdrake_interactive.pm_.c:1002
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "����� %d id %d\n"
+
+#: ../../diskdrake_interactive.pm_.c:1016
+#, fuzzy, 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: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:135
+#: ../../fs.pm_.c:506
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "����Һ��Ҩп������ %s �繪�Դ %s �����ҧ��"
 
-#: ../../fs.pm_.c:220
+#: ../../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 ""
+
+#: ../../fs.pm_.c:597 ../../fs.pm_.c:603 ../../partition_table.pm_.c:560
 msgid "mount failed: "
 msgstr "������ҷ��������: "
 
-#: ../../fs.pm_.c:232
+#: ../../fs.pm_.c:618 ../../partition_table.pm_.c:556
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "�Դ��Ҵ¡��ԡ������ҷ� %s: %s"
@@ -1830,39 +1993,42 @@ msgstr "����"
 msgid "server"
 msgstr "���������"
 
-#: ../../fsedit.pm_.c:261
+#: ../../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:264
+#: ../../fsedit.pm_.c:472
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "�վ���Ԫ�蹷���繨ش���ҷ��� %s ���º��������\n"
 
-#: ../../fsedit.pm_.c:272
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Circular mounts %s\n"
-
-#: ../../fsedit.pm_.c:284
+#: ../../fsedit.pm_.c:476
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "�س�������ö�� LVM Logical Volume ����Ѻ %s"
 
-#: ../../fsedit.pm_.c:285
+#: ../../fsedit.pm_.c:478
 msgid "This directory should remain within the root filesystem"
 msgstr "This directory should remain within the root filesystem"
 
-#: ../../fsedit.pm_.c:286
+#: ../../fsedit.pm_.c:480
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 
-#: ../../fsedit.pm_.c:368
+#: ../../fsedit.pm_.c:596
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "�Դ��ͼԴ��Ҵ㹡���Դ %s ����Ѻ�����¹: %s"
 
-#: ../../fsedit.pm_.c:452
+#: ../../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"
@@ -1870,1349 +2036,990 @@ msgstr ""
 "�Դ��ͼԴ��Ҵ��� - ��辺�ػ�ó���١��ͧ���ͨ����ҧ�к�������� "
 "�ô��Ǩ�ͺ��������ͧ��ҹ������䢻ѭ�ҹ��"
 
-#: ../../fsedit.pm_.c:466
+#: ../../fsedit.pm_.c:704
 msgid "You don't have any partitions!"
 msgstr "�س�ѧ������觾���Ԫ��!"
 
-#: ../../help.pm_.c:9
-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"
+#: ../../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 ""
-"You need to accept the terms of the above license to continue installation.\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."
-
-#: ../../help.pm_.c:22
-msgid "Choose the layout corresponding to your keyboard from the list above"
-msgstr "���͡�ٻẺ�ͧ������촵����¡�â�ҧ��"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
+msgstr ""
 
-#: ../../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 ""
-"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\"."
 
-#: ../../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 ""
-"��س����͡ \"�Դ���\" ����ѧ������ա�õԴ��� Linux-Mandrake �ҡ�͹\n"
-"���͵�ͧ��õԴ��� OS ���µ��\n"
-"\n"
-"\n"
-"��س����͡ \"Update\" ��Ҥس��ͧ��� Update Linux-Mandrake "
-"���Դ�����������\n"
-"\n"
-"\n"
-"������������� Linux �ͧ�س ��س��Ըա�÷�������������ش\n"
-"\n"
-"\t* Recommanded: ��Ҥس�����ŧ Linux �ҡ�͹\n"
-"\n"
-"\t* Customized: ��Ҥس���ѡ Linux �� �س����ö���͡���ŧẺ\n"
-"\t (workstation, server, ���� development)\n"
-"\n"
-"\n"
-"\t* Expert: ��Ҥس�դ������ Linux �����ҧ�� �����ǡѺ���ŧẺ \n"
-"\t customized �س����ö���͡ŧẺ workstation, server, ���� \n"
-"\t development) �س������ѧ���ҧ�ҡ㹡�����͡ŧ�ѡɳй��\n"
-"\t ��Ҥس�����㨡�س����͡ŧ�Ը����"
 
-#: ../../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"
+"!! 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"
-" - Ẻ��Ѻ����: ������͡��������X ��Ҥس����¡Ѻ�չء�����������\n"
-"   �س�Ҩ��ͧ������͡��õԴ����к������ҧ�к������, "
-"�к�����Ѻ�Ѳ�ҫͿ������\n"
-"   ����Ẻ��������� ������͡ \"����\" ����Ѻ�Դ��駵������ŧ㹤���������\n"
-"   �س�Ҩ���͡ \"�Ѳ�ҫͿ������\" "
-"��Ҥس��ͧ���������������ͧ�س����Ѻ��÷ӧҹ\n"
-"   Ẻ��þѲ�ҫͿ������ �������͡ \"��ÿ������\" ��Ҥس��ͧ���\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"
-"\n"
-" - Ẻ�������Ǫ�: (����Ѻ���ӹҭ����) ��Ҥس��ҹ GNU/Linux "
-"�����ҧ���ͧ����\n"
-"   ��е�ͧ��õԴ���Ẻ���͡���µ��ͧ ��õԴ���Ẻ���������������ش\n"
-"   �س�ѧ����ö�����͡��ҹ�к����س�Դ���Ẻ \"Ẻ��Ѻ����\"�����"
+"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 ""
-"�س��ͧ���͡�����ҹ�ͧ����ͧ�س �ҧ���͡���:\n"
-"\n"
-"\t* Workstation\n"
-"\t* Development\n"
-"\t* Server"
 
-#: ../../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"
-"\n"
+"You may now choose which services you wish to start 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"
+"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"
+"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 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 �о������� PCI SCSI adapter(s)  ��� DrakX\n"
-"���� SCSI adapter ��������Ҥ���������������� �ѹ���\n"
-"�١�Դ�����������ԡ\n"
-"\n"
-"\n"
-"��Ҥس�� SCSI adapter ISA adapter ���� PCI SCSI adapter ��� DrakX\n"
-"�������ö����  �س��ⴹ��������  SCSI adapter �����ͧ�ͧ�س\n"
-"�������  �������ա�سҡ���� \"���\"  ���Ҥس��ŧ���  \"��\" "
-"�س�е�ͧ���͡\n"
-"��Դ�ͧ adapter ���س������\n"
-"\n"
-"\n"
-"��Ҥس�繤����͡ Adapter �ͧ DrakX �ж����Ҥس�л�͹������\n"
-"Option �������  �֧�ç���س��è���� DrakX ���� option ����������\n"
-"����·�����ѹ������ö�����ͧ���ҧ�١��ͧ\n"
-"\n"
-"\n"
-"�����������稤س���繷��е�ͧ�������� Option �ͧ  �س����Ң���������\n"
-"�����ҡ������ (����� 3 �͹ Collective informations on your hardware ) "
-"���� \n"
-"�ҡ Web Site �ͧ����Ե ���� �ҡ Microsoft Windows ��Ҥس�յԴ���"
 
-#: ../../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 ""
+"��չء��ШѴ����к������� GMT ���� \"Greenwich Mean Time\" ����ŧ���\n"
+"������������ҷ�ͧ��� ��觨Т������Ѻ��ҹ���ҷ��س�����͡������"
 
-#: ../../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"
+"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"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\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"
-"   * 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"
-"\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"
+"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"
-"\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..."
+"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 ""
-"���͡ harddisk ����ͧ���ź���ŧ Linux-Mandrake\n"
-"������ѧ�����ҧ�ҡ�������Ң����ŷء���ҧ�ж١ź\n"
-"��Ш��������ö���׹��"
 
-#: ../../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 ""
-"�� \"OK\" ��Ҥس��ͧ���ź�����ŷ������� harddisk ���\n"
-"�������֧ partitions �������������֧ Windows ����\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"
-"�� \"¡��ԡ\" ����¡��ԡ��÷ӧҹ���"
+"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:\")."
+" * \"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"
-"\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"
+"    * \"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 \"OK\" when you are ready to format partitions.\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"
-"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
+#: ../../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 ""
-
-#: ../../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."
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
 msgstr ""
 
-#: ../../help.pm_.c:364
+#: ../../help.pm_.c:376
 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 ""
-
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../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"
-"\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"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\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"
-"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"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\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
-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 ""
-
-#: ../../help.pm_.c:431
-msgid ""
-"You may now configure your network device.\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\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"
+" * \"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"
-"   * 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"
+" * \"Undo\": use this option to cancel your changes.\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
-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 ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-
-#: ../../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"
+" * \"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"
-"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"
+" * \"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"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"��չء��ШѴ����к������� GMT ���� \"Greenwich Mean Time\" ����ŧ���\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"
-"��Ҥس�� Microsoft Windows ������ͧ��� ���͡ \"No\""
-
-#: ../../help.pm_.c:479
-msgid ""
-"You may now choose which services you want to start at boot time.\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"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
+" * Ctrl-m to set the mount point.\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."
+"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:492
+#: ../../help.pm_.c:460
 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"
-"\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"
+"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"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\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"
-"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"
+"\"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 your printer is physically connected to your computer, select \"Local\n"
-"printer\".\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"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\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 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\"."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
+msgstr "��س�ʹ�����ѡ���� ��÷ӧҹ�Ҩ���������¹ҷ�"
+
+#: ../../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"
+"��س����͡ \"�Դ���\" ����ѧ������ա�õԴ��� Mandrake Linux �ҡ�͹\n"
+"���͵�ͧ��õԴ��� OS ���µ��\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"
+"��س����͡ \"Update\" ��Ҥس��ͧ��� Update Mandrake Linux ���Դ�����������\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"
+"������������� Linux �ͧ�س ��س��Ըա�÷�������������ش\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"
+"* Recommanded: ��Ҥس�����ŧ Linux �ҡ�͹\n"
 "\n"
+"* Customized: ��Ҥس���ѡ Linux �� �س����ö���͡���ŧẺ\n"
+" (workstation, server, ���� development)\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"
+"* Expert: ��Ҥس�դ������ Linux �����ҧ�� �����ǡѺ���ŧẺ \n"
+" customized �س����ö���͡ŧẺ workstation, server, ���� \n"
+" development) �س������ѧ���ҧ�ҡ㹡�����͡ŧ�ѡɳй��\n"
+" ��Ҥس�����㨡�س����͡ŧ�Ը����"
+
+#: ../../help.pm_.c:521
+msgid ""
+"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 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
 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 ""
+
+#: ../../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 ""
-"�͹���س����ö��͹���ʼ�ҹ�ͧ�ٷ (�������к�) ��觤س�е�ͧ\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"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
-"�ٷ �繼������к� ����繼����ҹ��§�����Ƿ�����Ѻ͹حҵ���\n"
-"�ӡ�á����䢤͹�ԡ�ͧ�к��� �ѧ��鹤س���繨е�ͧ���͡\n"
-"���ʼ�ҹ���ҧ���Ѵ���ѧ �����ҹ���ͺѭ�բͧ�ٷ��������Ѻ͹حҵ\n"
-"�Ҩ�������Դ��������������ҧ�����ç�Ѻ�����١��ͧ�ͧ�����Ţͧ�к�\n"
-"����������ͧ������������蹷������������� ��á�˹����ʼ�ҹ�е�ͧ�ӡ��\n"
-"�����ҹ�ѹ�����ҧ����ѡ����е���Ţ �������դ���������ҧ���� 8 ����ѡ��\n"
-"�س *�����* �����ʼ�ҹ�ͧ�س��� ���ҡ�˹�������ʼ�ҹ������ͫѺ��͹�Թ�\n"
-"������ҡ�˹�������ʼ�ҹ�ҡ��ЫѺ��͹�Թ���Ҥس�Ш������"
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-
-#: ../../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 ""
 
-#: ../../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 ""
-"�͹���س����ö���ҧ���ͺѭ�ռ����Ẻ \"regular\" (�����) ������\n"
-"��觺ѭ��Ẻ����仹��س����ö���ҧ���ҡ����˹�觪��� "
-"(�ٷ�������������)\n"
-"��Ъ��ͺѭ�����Ъ��ͨС�˹����੾�м�������Ф������ҹ���������� ���\n"
-"���Ф�����բ�͡�˹��ͧ���ͧ (��Ҿ�Ǵ����Ẻ��ҿ�ԡ, "
-"�����������繵�)\n"
-"����� \"home directory\" (���硷��պ�ҹ) "
-"�繢ͧ���ͧ���«�����硷��պ�ҹ\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"
-"������к����� ���ͧ�ҡ�س�������ö��ҵԴ����к��ҡ���͢��¼�ҹ�ҧ\n"
-"���ͼ���� root �� (���ͧ�ҡ�к��ѡ�Ҥ�����ʹ���) ����ҡ�������ö�����\n"
-"�ҹ�к������������ö��ҹ����\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"
-"�ѧ��鹤س��èе�ͧ�Դ���������к���ҹ�ҧ���͢����·���¹�ͧ����黡��\n"
-"��觤س�����ҧ���㹢�鹵͹��� ��������͡�Թ��ҹ㹰ҹ��ٷ੾��������ըش\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."
-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 ""
-"�س�е�ͧ�͡����Һ��Ҥس��ͧ�����������\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"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\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)."
+"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 ""
 
-#: ../../help.pm_.c:653
+#: ../../help.pm_.c:647
 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"
+"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 ""
+
+#: ../../help.pm_.c:658
+#, fuzzy
+msgid ""
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\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!"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
 msgstr ""
+"�س�е�ͧ�͡����Һ��Ҥس��ͧ�����������\n"
+"�������Ǣ�ͧ�Ѻ��úٵ�չء��������\n"
+"\n"
+"\n"
+"��Ҥس����Һ��Ҥس�е�ͧ�����ҧ�� �ô���͡ \"�������á�ͧ���� (MBR)\"."
 
 #: ../../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"
+"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"
-"  - 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"
+"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"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \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 adapter(s)  ��� DrakX\n"
+"���� SCSI adapter ��������Ҥ���������������� �ѹ���\n"
+"�١�Դ�����������ԡ\n"
 "\n"
-"    * normal: select normal 80x25 text mode.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
+"��Ҥس�� SCSI adapter ISA adapter ���� PCI SCSI adapter ��� DrakX\n"
+"�������ö����  �س��ⴹ��������  SCSI adapter �����ͧ�ͧ�س\n"
+"�������  �������ա�سҡ���� \"���\"  ���Ҥس��ŧ���  \"��\" �س�е�ͧ���͡\n"
+"��Դ�ͧ adapter ���س������\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"
+"��Ҥس�繤����͡ Adapter �ͧ DrakX �ж����Ҥس�л�͹������\n"
+"Option �������  �֧�ç���س��è���� DrakX ���� option ����������\n"
+"����·�����ѹ������ö�����ͧ���ҧ�١��ͧ\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 ""
+"�����������稤س���繷��е�ͧ�������� Option �ͧ  �س����Ң���������\n"
+"�����ҡ������ (����� 3 �͹ Collective informations on your hardware ) ���� \n"
+"�ҡ Web Site �ͧ����Ե ���� �ҡ Microsoft Windows ��Ҥس�յԴ���"
 
-#: ../../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"
-"\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"
+"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"
-"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"
+"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"
+"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"
-"\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"
+" * 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"
-" \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"
-"\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"
-"\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 ""
-
-#: ../../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 ""
-
-#: ../../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 ""
-"�͹��������ҷ��Ф͹�ԡ�к� X �Թ�������� ����к� X ����᡹��ҧ�ͧ\n"
-"�к� GUI (Graphical User Interface) �ͧ�չء�� 㹡�ä͹�ԡ�س�е�ͧ\n"
-"�ӡ�ä͹�ԡ�Դ��͡�����Ш��Ҿ ��觢�鹵͹��ǹ�˭����Ẻ�ѵ��ѵԷ�����\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"
-"��ѧ�ҡ����ش��ä͹�ԡ X ���������鹷ӧҹ (¡��鹤س��������� DrakX ��)\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."
+" * \"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 ""
 
-#: ../../help.pm_.c:835
+#: ../../help.pm_.c:827
+#, fuzzy
 msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
+"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 ""
+"���͡ harddisk ����ͧ���ź���ŧ Mandrake Linux\n"
+"������ѧ�����ҧ�ҡ�������Ң����ŷء���ҧ�ж١ź\n"
+"��Ш��������ö���׹��"
 
-#: ../../help.pm_.c:839
+#: ../../help.pm_.c:832
+#, 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"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
+"\n"
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
+"�� \"OK\" ��Ҥس��ͧ���ź�����ŷ������� harddisk ���\n"
+"�������֧ partitions �������������֧ Windows ����\n"
+"\n"
+"\n"
+"�� \"¡��ԡ\" ����¡��ԡ��÷ӧҹ���"
 
-#: ../../help.pm_.c:844
+#: ../../install2.pm_.c:114
+#, c-format
 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."
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
 
-#: ../../install2.pm_.c:39
-msgid "Choose your language"
-msgstr "���͡���ҷ��س��"
-
-#: ../../install2.pm_.c:40
-msgid "Select installation class"
-msgstr "���͡�ش��õԴ���"
-
-#: ../../install2.pm_.c:41
-msgid "Hard drive detection"
-msgstr "��õ�Ǩ����������"
-
-#: ../../install2.pm_.c:42
-msgid "Configure mouse"
-msgstr "�͹�ԡ������"
-
-#: ../../install2.pm_.c:43
-msgid "Choose your keyboard"
-msgstr "���͡�������"
-
-#: ../../install2.pm_.c:44
-msgid "Security"
-msgstr "�к�������ͧ�ѹ"
-
-#: ../../install2.pm_.c:45
-msgid "Setup filesystems"
-msgstr "���Ѿ�к����"
-
-#: ../../install2.pm_.c:46
-msgid "Format partitions"
-msgstr "�����������Ԫ��"
-
-#: ../../install2.pm_.c:47
-msgid "Choose packages to install"
-msgstr "���͡����"
-
-#: ../../install2.pm_.c:48
-msgid "Install system"
-msgstr "�Դ����к�"
-
-#: ../../install2.pm_.c:49 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "�����ʼ�ҹ�ٷ"
-
-#: ../../install2.pm_.c:50
-msgid "Add a user"
-msgstr "���������"
-
-#: ../../install2.pm_.c:51
-msgid "Configure networking"
-msgstr "�͹�ԡ�к��������"
-
-#: ../../install2.pm_.c:53 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
-msgstr "�������"
-
-#: ../../install2.pm_.c:54
-msgid "Configure services"
-msgstr "��Ѻ�觡�ú�ԡ�õ�ҧ�"
-
-#: ../../install2.pm_.c:56
-msgid "Create a bootdisk"
-msgstr "���ҧ�蹺ٵ"
-
-#: ../../install2.pm_.c:58
-msgid "Install bootloader"
-msgstr "�Դ��駺ٵ��Ŵ����"
-
-#: ../../install2.pm_.c:59
-msgid "Configure X"
-msgstr "�͹�ԡ�к� X"
-
-#: ../../install2.pm_.c:60
-msgid "Exit install"
-msgstr "�͡�ҡ��õԴ���"
-
-#: ../../install_any.pm_.c:373
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3227,20 +3034,20 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: ../../install_any.pm_.c:404
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../../install_any.pm_.c:647
+#: ../../install_any.pm_.c:793
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "�������蹿��ͻ����� format Ẻ FAT ŧ����� %s"
 
-#: ../../install_any.pm_.c:651
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
 msgstr "��蹿��ͻ����� ����� ẺFAT"
 
-#: ../../install_any.pm_.c:661
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3248,30 +3055,20 @@ msgstr ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 
-#: ../../install_any.pm_.c:683
-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:95 ../../interactive.pm_.c:110
-#: ../../interactive.pm_.c:265 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:616 ../../my_gtk.pm_.c:639
+#: ../../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
-msgid "To activate the mouse,"
-msgstr "�������������ӧҹ"
-
-#: ../../install_gtk.pm_.c:425
-msgid "MOVE YOUR WHEEL!"
-msgstr "����͹��ͧ͢�س"
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3281,7 +3078,7 @@ msgstr ""
 "hardware �ҧ��Դ��ͧ��� driver �����\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"
@@ -3291,11 +3088,11 @@ msgstr ""
 "���Щ��鹤س��ͧ���ҧ ����Ԫ�� (���͡����͡�ѹ���������)\n"
 "��ѧ�ҡ������͡ ``Mount Point'' ��ШѴ����ѹ�� `/'"
 
-#: ../../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 "�س�е�ͧ�վ���Ԫ����ͻ"
 
-#: ../../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"
@@ -3305,55 +3102,60 @@ 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 "�س�е�ͧ�վ���Ԫ����ͻ"
+
+#: ../../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 partion ����Ѻ��� 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 partition"
 
-#: ../../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"
@@ -3362,11 +3164,11 @@ msgstr ""
 "�������¹��Ҵ�������ö�ӧҹ�Ѻ partition �ͧ�س\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 partition �ͧ�س��ШѴ��Ш���ҡ�Թ� ��س� Defrag ��͹"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:123
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3383,54 +3185,52 @@ msgstr ""
 "Backup �������Ӥѭ����ҡ�͹\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)"
-msgstr ""
-"����� ����Ԫ�� FAT ���ͷӡ�����¹��Ҵ����������� loopback "
-"(��鹷������)"
+msgstr "����� ����Ԫ�� FAT ���ͷӡ�����¹��Ҵ����������� loopback (��鹷������)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:160
 msgid "Erase entire disk"
 msgstr "ź disk ������"
 
-#: ../../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 "�س�� harddisk �ҡ����  1 ���  �س��ͧ���ŧ linux �� harddisk ����˹"
 
-#: ../../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
+#: ../../install_interactive.pm_.c:174
 msgid "Custom disk partitioning"
 msgstr "���ѧ����Ԫ�� Custom disk"
 
-#: ../../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"
@@ -3439,28 +3239,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 "The DrakX Partitioning wizard �ͷҧ���͡�ѧ���仹��"
 
-#: ../../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 "�к�������졡��ѧ����ش�ӧҹ"
 
@@ -3472,33 +3272,33 @@ msgstr ""
 "�դ����Դ��Ҵ�Դ��� ��������������ö�����\n"
 "�ҡ�ӧҹ����Ҩ�Դ�������������"
 
-#: ../../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"
-"Check the cdrom on an installed computer using \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
+"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"\"\n"
 msgstr ""
 "��ࡨ�Ӥѭ�ҧ���ҧ�����١�Դ������ҧ���º����\n"
 "cdrom ���� cdrom drive �ͧ�س�Ҩ�ա���������\n"
 "��سҵ�Ǩ�ͺ cdrom �����ͧ�������������ա�õԴ�������\n"
 "���� \"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"
@@ -3512,32 +3312,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 "���ѧ�Դ���"
 
@@ -3545,7 +3345,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 "���ҷ������� "
 
@@ -3554,21 +3354,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 "�ջѭ�ҡ���ӴѺ�ͧ����:"
 
@@ -3576,28 +3376,33 @@ msgstr "�ջѭ�ҡ���ӴѺ�ͧ����:"
 msgid "Use existing configuration for X11?"
 msgstr "��͹�ԡ������������Ǣͧ�к� 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 ""
 "����ͧ�ͧ�س�շ�Ѿ�ҡä�͹��ҧ��Ӥس�Ҩ�ջѭ�ҵԴ��� \n"
-"Linux-Mandrake  ������蹹�� ��سҷ��ͧ�Դ���Ẻ text \n"
+"Mandrake Linux  ������蹹�� ��سҷ��ͧ�Դ���Ẻ text \n"
 "��سҡ� F1 ��� boot �ҡ 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 "��س����͡ 1 ��Ըա�õԴ��駴ѧ���仹��"
 
-#: ../../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"
 "select the percentage of packages that you want to install.\n"
@@ -3612,7 +3417,8 @@ 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"
 "\n"
@@ -3629,83 +3435,67 @@ 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 "Individual package selection"
 
-#: ../../install_steps_gtk.pm_.c:349
-msgid "Show automatically selected packages"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:416
-msgid "Expand Tree"
-msgstr "���� tree"
-
-#: ../../install_steps_gtk.pm_.c:417
-msgid "Collapse Tree"
-msgstr "�غ tree"
-
-#: ../../install_steps_gtk.pm_.c:418
-msgid "Toggle between flat and group sorted"
-msgstr "����¹��������ҧ��èѴ���§Ẻ flat ���� group"
+#: ../../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 "�س�������ö���͡ package ������ͧ�ҡ�س�վ�鹷�������§��"
 
-#: ../../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?"
@@ -3713,24 +3503,43 @@ msgstr ""
 "ᾡࡨ�����繵�ͧ�١ upgrade\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 "�س�������ö������͡ᾡࡨ���  �ѹ���繷��е�ͧ�١ upgrade"
 
-#: ../../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 "�ѹ�֡��������稷�����͡"
+
+#: ../../install_steps_gtk.pm_.c:466
+#, fuzzy
+msgid "Minimal install"
+msgstr "�͡�ҡ��õԴ���"
+
+#: ../../install_steps_gtk.pm_.c:503
 msgid "Estimating"
 msgstr "��û����Թ"
 
-#: ../../install_steps_gtk.pm_.c:582
+#: ../../install_steps_gtk.pm_.c:522
 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"
@@ -3762,15 +3571,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"
@@ -3784,7 +3593,7 @@ msgstr ""
 "��س���� CD-ROM \"%s\" ��С� OK\n"
 "���Ҥس����� ��سҡ� ¡��ԡ (cancel) ������ա����§��õԴ��駨ҡ CD-ROM ���"
 
-#: ../../install_steps_gtk.pm_.c:699
+#: ../../install_steps_gtk.pm_.c:646
 msgid "There was an error installing packages:"
 msgstr "�ջѭ�ҡ�õԴ��駢ͧ����:"
 
@@ -3792,34 +3601,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 "License agreement"
 
-#: ../../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"
@@ -3873,7 +3669,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"
@@ -3910,7 +3706,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"
@@ -3931,13 +3727,13 @@ msgid ""
 msgstr ""
 "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"
@@ -3991,7 +3787,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"
@@ -4028,7 +3824,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"
@@ -4047,103 +3843,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 "�������"
 
-#: ../../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 "���仹���� keyboard �������"
 
-#: ../../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 "Ẻ�й� (Recommended)"
 
-#: ../../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 "Update"
 
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/mousedrake_.c:31
+#: ../../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:46
+#: ../../install_steps_interactive.pm_.c:230 ../../standalone/mousedrake_.c:64
 msgid "Mouse Port"
 msgstr "���쵢ͧ������"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:47
+#: ../../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 ""
 
-#: ../../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 "Scanning partitions to find mount points"
 
-#: ../../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"
@@ -4160,7 +3952,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!"
@@ -4168,77 +3960,118 @@ msgstr ""
 "��ʡ��á ������Ƿ�����ҹ���ҧ����Ԫ�����١��ͧ\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 ""
+
+#: ../../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 "����Ԫ������ٷ����Ԫ�� (/) ��к��ͧ�س"
 
-#: ../../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 "��Ǩ�ͺ bad 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 "���ѧ���ҧ��� format ��� %s"
 
-#: ../../install_steps_interactive.pm_.c:432
+#: ../../install_steps_interactive.pm_.c:421
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "����վ�鹷����ͻ��§�͡Ѻ��õԴ��� �ô�������ͷ��"
 
-#: ../../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 "����ͧ�ͧ�س��������ͷ����§��㹡�õԴ������� upgrade (%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 "Ẻ��Ѻ���� (Customized) "
 
-#: ../../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"
@@ -4248,12 +4081,13 @@ msgstr ""
 "����������� �� ¡��ԡ (cancel)\n"
 "�������ҧ�� ���͡��ҷ�������ǡ� OK"
 
-#: ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:675
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom labeled \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:684
+#: ../../install_steps_interactive.pm_.c:704
+#, c-format
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -4261,11 +4095,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"
@@ -4304,93 +4148,140 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../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?"
+#: ../../install_steps_interactive.pm_.c:813
+#, fuzzy
+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 ""
+
+#: ../../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 "Remote CUPS server"
 
-#: ../../install_steps_interactive.pm_.c:807
+#: ../../install_steps_interactive.pm_.c:856
 msgid "No printer"
 msgstr "���������ͧ�����"
 
-#: ../../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
 msgid "Mouse"
 msgstr "Mouse"
 
-#: ../../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
 msgid "ISDN card"
 msgstr "ISDN card"
 
-#: ../../install_steps_interactive.pm_.c:829
+#: ../../install_steps_interactive.pm_.c:878
 msgid "Sound card"
 msgstr "Sound card"
 
-#: ../../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:881
 msgid "TV card"
 msgstr "TV card"
 
-#: ../../install_steps_interactive.pm_.c:862
-msgid "Which printing system do you want to use?"
-msgstr "�������ͧ��þ���쪹Դ�˹���س��ͧ���"
+#: ../../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:896
+#: ../../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 "�����ʼ�ҹ�ٷ"
+
+#: ../../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
+#, fuzzy
+msgid "Authentication LDAP"
+msgstr "��õ�Ǩ�ͺ�Է�������ҹ"
 
-#: ../../install_steps_interactive.pm_.c:912
-msgid "Authentification NIS"
+#: ../../install_steps_interactive.pm_.c:950
+msgid "LDAP Base dn"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:951
+#, fuzzy
+msgid "LDAP Server"
+msgstr "��������� NIS"
+
+#: ../../install_steps_interactive.pm_.c:957
+#, fuzzy
+msgid "Authentication NIS"
 msgstr "��õ�Ǩ�ͺ�Է�������ҹ�ͧ NIS"
 
-#: ../../install_steps_interactive.pm_.c:913
+#: ../../install_steps_interactive.pm_.c:958
 msgid "NIS Domain"
 msgstr "���� NIS"
 
-#: ../../install_steps_interactive.pm_.c:914
+#: ../../install_steps_interactive.pm_.c:959
 msgid "NIS Server"
 msgstr "��������� NIS"
 
-#: ../../install_steps_interactive.pm_.c:948
+#: ../../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 "
@@ -4415,19 +4306,19 @@ msgstr ""
 "�׹�к��ҡ�����Դ��Ҵ����� �س��ͧ��è����ҧ�蹺ٵ�������?\n"
 "����� ��س������ Diskette ��С� \"OK\""
 
-#: ../../install_steps_interactive.pm_.c:964
+#: ../../install_steps_interactive.pm_.c:1010
 msgid "First floppy drive"
 msgstr "Floppy Drive ����ͧ�á"
 
-#: ../../install_steps_interactive.pm_.c:965
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Second floppy drive"
 msgstr "Floppy Drive ����ͧ����ͧ"
 
-#: ../../install_steps_interactive.pm_.c:966
+#: ../../install_steps_interactive.pm_.c:1012 ../../printerdrake.pm_.c:1382
 msgid "Skip"
 msgstr "�����"
 
-#: ../../install_steps_interactive.pm_.c:971
+#: ../../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 "
@@ -4447,32 +4338,40 @@ msgstr ""
 "������ö��Ѻ���������׹�к��ͧ������ ��觨Ъ������س����ö�ӡ�á��\n"
 "�׹�к��ҡ�����Դ��Ҵ����� �س��ͧ��è����ҧ�蹺ٵ�������? "
 
-#: ../../install_steps_interactive.pm_.c:980
+#: ../../install_steps_interactive.pm_.c:1026
 msgid "Sorry, no floppy drive available"
 msgstr "������ ����տ��ͻ����������"
 
-#: ../../install_steps_interactive.pm_.c:984
+#: ../../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:988
+#: ../../install_steps_interactive.pm_.c:1034
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "�������蹿��ͻ���ŧ����� %s"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Creating bootdisk"
 msgstr "���ѧ���ҧ�蹺ٵ"
 
-#: ../../install_steps_interactive.pm_.c:998
+#: ../../install_steps_interactive.pm_.c:1044
 msgid "Preparing bootloader"
 msgstr "���ѧ������ٵ��Ŵ����"
 
-#: ../../install_steps_interactive.pm_.c:1007
+#: ../../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:1010
+#: ../../install_steps_interactive.pm_.c:1063
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -4480,51 +4379,54 @@ msgstr ""
 "��õԴ��� aboot �������\n"
 "�������Դ��駶֧���ҵԪ���á�Ҩ���������?"
 
-#: ../../install_steps_interactive.pm_.c:1019
+#: ../../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 "��õԴ��� bootloader ������� ���仹���繢�ͼԴ��Ҵ����Դ���"
 
-#: ../../install_steps_interactive.pm_.c:1027
+#: ../../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:1035 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1092 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "���"
 
-#: ../../install_steps_interactive.pm_.c:1036 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1093 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "�ҹ��ҧ"
 
-#: ../../install_steps_interactive.pm_.c:1037 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "�٧"
 
-#: ../../install_steps_interactive.pm_.c:1041 ../../standalone/draksec_.c:49
+#: ../../install_steps_interactive.pm_.c:1098 ../../standalone/draksec_.c:62
 msgid "Choose security level"
 msgstr "���͡�дѺ�к��ѡ�Ҥ�����ʹ���"
 
-#: ../../install_steps_interactive.pm_.c:1074
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr "�س��ͧ��èз��� floppy ���͡�õԴ���Ẻ�����������?"
-
-#: ../../install_steps_interactive.pm_.c:1076
+#: ../../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:1090
-#: ../../install_steps_interactive.pm_.c:1122
+#: ../../install_steps_interactive.pm_.c:1138
+#: ../../standalone/drakautoinst_.c:82
 msgid "Creating auto install floppy"
 msgstr "���ѧ�������õԴ���ŧ�� floppy"
 
-#: ../../install_steps_interactive.pm_.c:1150
+#: ../../install_steps_interactive.pm_.c:1149
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -4534,33 +4436,32 @@ msgstr ""
 "\n"
 "�س��ͧ����͡�ҡ��õԴ��駨�ԧ��������?"
 
-#: ../../install_steps_interactive.pm_.c:1161
+#: ../../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"
-"���������ͷ����ٵ�͡�ҡ���� (�蹿��ͻ������ͫմ�) "
-"�����������������պٵ\n"
+"���������ͷ����ٵ�͡�ҡ���� (�蹿��ͻ������ͫմ�) �����������������պٵ\n"
 "\n"
 "����Ѻ��ҹ����ͧ��â���������Ѻ�����䢡Ѻ �չء��-����á\n"
-"�ô��ҹ Errata ���� http://www.linux-mandrake.com/\n"
+"�ô��ҹ Errata ���� http://www.mandrakelinux.com/\n"
 "\n"
 "����������Ѻ��ä͹�ԡ�к��ͧ�س ����ö����ҡ��ǧ\n"
 "����ѧ�ҡ��õԴ��駢ͧ�������йӼ����ҹ�չء��-����á��Ѻ�繷ҧ���"
 
-#: ../../install_steps_interactive.pm_.c:1173
+#: ../../install_steps_interactive.pm_.c:1172
 msgid "Generate auto install floppy"
 msgstr "���ҧfloppy����Ѻ��õԴ���Ẻ������ԡ"
 
-#: ../../install_steps_interactive.pm_.c:1175
+#: ../../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"
@@ -4573,40 +4474,57 @@ msgstr ""
 "(�ѹ����СѺ��õԴ��駺�����ͧ���)\n"
 "�س�Ҩ��ҡ��Ѻ�������鹵Դ�������\n"
 
-#: ../../install_steps_interactive.pm_.c:1180
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Automated"
 msgstr "�ѵ��ѵ�"
 
-#: ../../install_steps_interactive.pm_.c:1180
+#: ../../install_steps_interactive.pm_.c:1179
 msgid "Replay"
 msgstr "���¡�ա����"
 
-#: ../../install_steps_interactive.pm_.c:1183
+#: ../../install_steps_interactive.pm_.c:1182
 msgid "Save packages selection"
 msgstr "�ѹ�֡��������稷�����͡"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
+msgid "Mandrake Linux Installation %s"
 msgstr "��õԴ����չء��-����á %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
+#: ../../interactive.pm_.c:73
 msgid "kdesu missing"
 msgstr "����� kdesu "
 
-#: ../../interactive.pm_.c:263
+#: ../../interactive.pm_.c:132
+#, fuzzy
+msgid "Choose a file"
+msgstr "���͡�Ԩ����"
+
+#: ../../interactive.pm_.c:284
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../../interactive.pm_.c:286
+#: ../../interactive.pm_.c:345
 msgid "Please wait"
 msgstr "�ô���ѡ����"
 
+#: ../../interactive_gtk.pm_.c:681
+msgid "Expand Tree"
+msgstr "���� tree"
+
+#: ../../interactive_gtk.pm_.c:682
+msgid "Collapse Tree"
+msgstr "�غ tree"
+
+#: ../../interactive_gtk.pm_.c:683
+msgid "Toggle between flat and group sorted"
+msgstr "����¹��������ҧ��èѴ���§Ẻ flat ���� group"
+
 #: ../../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
@@ -4632,267 +4550,291 @@ msgstr "������͡�ͧ�س? (��ҵ�駵� %s)"
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "������͡�ͧ�س? (��ҵ�駵� %s ������ `none' ���͵�����͡��ҧ) "
 
-#: ../../keyboard.pm_.c:124 ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:140 ../../keyboard.pm_.c:178
 msgid "Czech (QWERTZ)"
 msgstr "ત��������� (QWERTZ)"
 
-#: ../../keyboard.pm_.c:125 ../../keyboard.pm_.c:138 ../../keyboard.pm_.c:157
+#: ../../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:163
+#: ../../keyboard.pm_.c:143 ../../keyboard.pm_.c:186
 msgid "Spanish"
 msgstr "�໹"
 
-#: ../../keyboard.pm_.c:128 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:144 ../../keyboard.pm_.c:187
 msgid "Finnish"
 msgstr "�Թ�Ź��"
 
-#: ../../keyboard.pm_.c:129 ../../keyboard.pm_.c:139 ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:145 ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:188
 msgid "French"
 msgstr "�������"
 
-#: ../../keyboard.pm_.c:130 ../../keyboard.pm_.c:186
+#: ../../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:191
+#: ../../keyboard.pm_.c:148 ../../keyboard.pm_.c:219
 msgid "Russian"
 msgstr "������"
 
-#: ../../keyboard.pm_.c:133 ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:150 ../../keyboard.pm_.c:221
+msgid "Swedish"
+msgstr "���ഹ"
+
+#: ../../keyboard.pm_.c:151 ../../keyboard.pm_.c:236
 msgid "UK keyboard"
 msgstr "�ѧ���"
 
-#: ../../keyboard.pm_.c:134 ../../keyboard.pm_.c:137 ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:237
 msgid "US keyboard"
 msgstr "����ԡ�"
 
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:159
+#, fuzzy
+msgid "Albanian"
+msgstr "Iranian"
+
+#: ../../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:146
+#: ../../keyboard.pm_.c:167
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latin)"
 
-#: ../../keyboard.pm_.c:147
-msgid "Azerbaidjani (cyrillic)"
-msgstr "Azerbaidjani (cyrillic)"
-
-#: ../../keyboard.pm_.c:148
+#: ../../keyboard.pm_.c:169
 msgid "Belgian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:170
 msgid "Bulgarian"
 msgstr "��š�����"
 
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:171
 msgid "Brazilian (ABNT-2)"
 msgstr "��ҫ��"
 
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:172
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:173
 msgid "Swiss (German layout)"
 msgstr "���� (�������ҷ��������ѹ)"
 
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:174
 msgid "Swiss (French layout)"
 msgstr "���� (�������ҷ����������)"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm_.c:179
 msgid "Czech (QWERTY)"
 msgstr "ત��������� (QWERTY)"
 
-#: ../../keyboard.pm_.c:156
-msgid "Czech (Programmers)"
-msgstr "Czech (Programmers)"
-
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:181
 msgid "German (no dead keys)"
 msgstr "German (no dead keys)"
 
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:182
 msgid "Danish"
 msgstr "ഹ����"
 
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:183
 msgid "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:184
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:185
 msgid "Estonian"
 msgstr "Estonian"
 
-#: ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:189
 msgid "Georgian (\"Russian\" layout)"
 msgstr "������� (�������ҷ�Ẻ������)"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:190
 msgid "Georgian (\"Latin\" layout)"
 msgstr "������� (�������ҷ�Ẻ�еԹ)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:191
 msgid "Greek"
 msgstr "��ա"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:192
 msgid "Hungarian"
 msgstr "�ѧ����"
 
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:193
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:194
 msgid "Israeli"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:195
 msgid "Israeli (Phonetic)"
 msgstr "�������� (�๵Ԥ)"
 
-#: ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:196
 msgid "Iranian"
 msgstr "Iranian"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:197
 msgid "Icelandic"
 msgstr "�ͫ��Ź��"
 
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:198
 msgid "Italian"
 msgstr "�Ե���"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:200
 msgid "Japanese 106 keys"
 msgstr "Japanese 106 keys"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:201
 msgid "Korean keyboard"
 msgstr "Korean keyboard"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:202
 msgid "Latin American"
 msgstr "�еԹ����ԡ�"
 
-#: ../../keyboard.pm_.c:179
-msgid "Macedonian"
-msgstr "Macedonian"
-
-#: ../../keyboard.pm_.c:180
-msgid "Dutch"
-msgstr "����Ź��"
-
-#: ../../keyboard.pm_.c:181
+#: ../../keyboard.pm_.c:203
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lithuanian AZERTY (old)"
 
-#: ../../keyboard.pm_.c:183
+#: ../../keyboard.pm_.c:205
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lithuanian AZERTY (new)"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:206
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "�Ը����� \"�ǵ���Ţ\" QWERTY"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:207
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "�Ը����� \"�๵Ԥ\" QWERTY"
 
-#: ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:208
+#, fuzzy
+msgid "Latvian"
+msgstr "���˹�"
+
+#: ../../keyboard.pm_.c:209
+msgid "Macedonian"
+msgstr "Macedonian"
+
+#: ../../keyboard.pm_.c:210
+msgid "Dutch"
+msgstr "����Ź��"
+
+#: ../../keyboard.pm_.c:212
 msgid "Polish (qwerty layout)"
 msgstr "Polish (qwerty layout)"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:213
 msgid "Polish (qwertz layout)"
 msgstr "Polish (qwertz layout)"
 
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:214
 msgid "Portuguese"
 msgstr "�õ���"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:215
 msgid "Canadian (Quebec)"
 msgstr "�ҹҴ� (���຤)"
 
-#: ../../keyboard.pm_.c:192
-msgid "Russian (Yawerty)"
+#: ../../keyboard.pm_.c:217
+#, fuzzy
+msgid "Romanian (qwertz)"
 msgstr "������ (Yawerty)"
 
-#: ../../keyboard.pm_.c:193
-msgid "Swedish"
-msgstr "���ഹ"
+#: ../../keyboard.pm_.c:218
+#, fuzzy
+msgid "Romanian (qwerty)"
+msgstr "������ (Yawerty)"
 
-#: ../../keyboard.pm_.c:194
+#: ../../keyboard.pm_.c:220
+msgid "Russian (Yawerty)"
+msgstr "������ (Yawerty)"
+
+#: ../../keyboard.pm_.c:222
 msgid "Slovenian"
 msgstr "��������"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:226
 msgid "Slovakian (QWERTZ)"
 msgstr "�������� (QWERTZ)"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:227
 msgid "Slovakian (QWERTY)"
 msgstr "�������� (QWERTY)"
 
-#: ../../keyboard.pm_.c:197
-msgid "Slovakian (Programmers)"
-msgstr "Slovakian (Programmers)"
+#: ../../keyboard.pm_.c:229
+#, fuzzy
+msgid "Serbian (cyrillic)"
+msgstr "Azerbaidjani (cyrillic)"
 
-#: ../../keyboard.pm_.c:198
+#: ../../keyboard.pm_.c:230
 msgid "Thai keyboard"
 msgstr "��"
 
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:232
+#, fuzzy
+msgid "Tajik keyboard"
+msgstr "��"
+
+#: ../../keyboard.pm_.c:233
 msgid "Turkish (traditional \"F\" model)"
 msgstr "��á� (����ẺἹ \"F\")"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:234
 msgid "Turkish (modern \"Q\" model)"
 msgstr "��á� (������������ \"Q\")"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:235
 msgid "Ukrainian"
 msgstr "���ù"
 
-#: ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:238
 msgid "US keyboard (international)"
 msgstr "�����������ԡѹ (�ҹҪҵ�)"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:239
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamese \"numeric row\" QWERTY"
 
-#: ../../keyboard.pm_.c:206
-msgid "Yugoslavian (latin/cyrillic)"
+#: ../../keyboard.pm_.c:240
+#, fuzzy
+msgid "Yugoslavian (latin)"
 msgstr "���������� (�������ҷ�Ẻ�еԹ)"
 
-#: ../../lvm.pm_.c:70
+#: ../../loopback.pm_.c:32
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Circular mounts %s\n"
+
+#: ../../lvm.pm_.c:83
 msgid "Remove the logical volumes first\n"
 msgstr "ź logical volume ��͹\n"
 
@@ -5004,170 +4946,219 @@ msgstr "�����"
 msgid "No mouse"
 msgstr "�����������"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../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 ""
+
+#: ../../my_gtk.pm_.c:415
 msgid "Finish"
 msgstr "�Թ�Ź��"
 
-#: ../../my_gtk.pm_.c:356
+#: ../../my_gtk.pm_.c:415
 msgid "Next ->"
 msgstr "Next ->"
 
-#: ../../my_gtk.pm_.c:357
+#: ../../my_gtk.pm_.c:416
 msgid "<- Previous"
 msgstr "<- ��͹"
 
-#: ../../my_gtk.pm_.c:616
+#: ../../my_gtk.pm_.c:716
 msgid "Is this correct?"
 msgstr "�١��ͧ�������?"
 
-#: ../../netconnect.pm_.c:141
-msgid "Internet configuration"
-msgstr "��ä͹�ԡ Internet"
+#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "������ Internet "
 
-#: ../../netconnect.pm_.c:142
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "�س��ͧ��÷��ͺ������ Internet ����ǹ���������"
+#: ../../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"
+"��Ҥس����Һ ���͡ 'use pppoe'"
 
-#: ../../netconnect.pm_.c:146
-msgid "Testing your connection..."
-msgstr "���ͺ connection..."
+#: ../../network/adsl.pm_.c:22
+msgid "Alcatel speedtouch usb"
+msgstr ""
 
-#: ../../netconnect.pm_.c:152 ../../standalone/draknet_.c:196
-msgid "The system is now connected to Internet."
-msgstr "�Դ������ Internet ���º����"
+#: ../../network/adsl.pm_.c:22
+msgid "use dhcp"
+msgstr "�� dhcp"
 
-#: ../../netconnect.pm_.c:153
-msgid "For Security reason, it will be disconnected now."
-msgstr "���ͤ�����ʹ��� �ѹ����ش��õԴ�������ǹ��"
+#: ../../network/adsl.pm_.c:22
+msgid "use pppoe"
+msgstr "�� pppoe"
 
-#: ../../netconnect.pm_.c:154 ../../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 ""
-"�������ö������ Internet \n"
-"�ͧ�ӡ�ä͹�ԡ�����ա����"
-
-#: ../../netconnect.pm_.c:159 ../../netconnect.pm_.c:901
-#: ../../netconnect.pm_.c:930 ../../netconnect.pm_.c:1008
-msgid "Network Configuration"
-msgstr "��ä͹�ԡ�к��������"
-
-#: ../../netconnect.pm_.c:220 ../../netconnect.pm_.c:264
-#: ../../netconnect.pm_.c:274 ../../netconnect.pm_.c:281
-#: ../../netconnect.pm_.c:291
-msgid "ISDN Configuration"
-msgstr "��ä͹�ԡ ISDN"
+"��Դ�ͧ dhcp client ����ͧ�����������\n"
+"������͡���ͧ�鹤�� dhcpcd"
 
-#: ../../netconnect.pm_.c:220
+#: ../../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:234
-msgid "Connection Configuration"
-msgstr "��ä͹�ԡ Connection"
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:233
+msgid "Choose the network interface"
+msgstr "���͡ network interface"
 
-#: ../../netconnect.pm_.c:235
-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 "��س����͡ Network Adaptor ����Ѻ��õ����� Internet"
 
-#: ../../netconnect.pm_.c:237 ../../standalone/draknet_.c:550
-msgid "Card IRQ"
-msgstr "Card IRQ"
+#: ../../network/ethernet.pm_.c:178
+msgid "no network card found"
+msgstr "��辺�����������"
 
-#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:551
-msgid "Card mem (DMA)"
-msgstr "Card mem (DMA)"
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:350
+msgid "Configuring network"
+msgstr "���ѧ�͹�ԡ�к��������"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:552
-msgid "Card IO"
-msgstr "Card 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"
+"���ͧ͢��ʵ����������ٻẺ (���������������)\n"
+"������ҧ�� ``mybox.mylab.yco.com''\n"
+"�س�Ҩ������� IP �ͧࡵ������¶�Ҥس������ͧ����˹�ҷ����ࡵ��������"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:553
-msgid "Card IO_0"
-msgstr "Card IO_0"
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:355
+msgid "Host name"
+msgstr "������ʵ�:"
 
-#: ../../netconnect.pm_.c:241 ../../standalone/draknet_.c:554
-msgid "Card IO_1"
-msgstr "Card 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 "Network Configuration Wizard"
 
-#: ../../netconnect.pm_.c:242 ../../standalone/draknet_.c:555
-msgid "Your personal phone number"
-msgstr "�������Ѿ����ǹ���"
+#: ../../network/isdn.pm_.c:22
+msgid "External ISDN modem"
+msgstr "External ISDN modem"
 
-#: ../../netconnect.pm_.c:243 ../../standalone/draknet_.c:556
-msgid "Provider name (ex provider.net)"
-msgstr "���ͼ������ԡ�� (ex KSC)"
+#: ../../network/isdn.pm_.c:22
+msgid "Internal ISDN card"
+msgstr "Internal ISDN card"
 
-#: ../../netconnect.pm_.c:244 ../../standalone/draknet_.c:557
-msgid "Provider phone number"
-msgstr "�����Ţ���Ѿ��"
+#: ../../network/isdn.pm_.c:22
+msgid "What kind is your ISDN connection?"
+msgstr "��õԴ���Ẻ ISDN �ͧ�س��Ẻ�"
 
-#: ../../netconnect.pm_.c:245
-msgid "Provider dns 1"
-msgstr "Provider 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:246
-msgid "Provider dns 2"
-msgstr "Provider dns 2"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "New configuration (isdn-light)"
+msgstr "��Ǩ���͹�ԡ�ͧ Firewall"
 
-#: ../../netconnect.pm_.c:247 ../../standalone/draknet_.c:562
-msgid "Dialing mode"
-msgstr "�����ع���Ѿ����������"
+#: ../../network/isdn.pm_.c:54
+#, fuzzy
+msgid "Old configuration (isdn4net)"
+msgstr "��Ǩ���͹�ԡ�ͧ Firewall"
 
-#: ../../netconnect.pm_.c:248 ../../standalone/draknet_.c:560
-msgid "Account Login (user name)"
-msgstr "Account Login (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:249 ../../standalone/draknet_.c:561
-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:259
-msgid "Europe"
-msgstr "���û"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Boot Protocol"
 
-#: ../../netconnect.pm_.c:259
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "���û (EDS11)"
 
-#: ../../netconnect.pm_.c:261
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
 msgstr "Rest of the world"
 
-#: ../../netconnect.pm_.c:261
+#: ../../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 ""
 "Rest of the world \n"
 " no D-Channel (leased lines)"
 
-#: ../../netconnect.pm_.c:265
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Protocol �˹���س��ͧ���"
 
-#: ../../netconnect.pm_.c:275
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "�س�ա��촪�Դ�?"
 
-#: ../../netconnect.pm_.c:276
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "������Һ"
 
-#: ../../netconnect.pm_.c:276
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:276
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:282
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -5179,127 +5170,77 @@ msgstr ""
 "\n"
 "��Ҥس�ա��� PCMCIA �س��ͧ��� irq ��� io �ͧ���촢ͧ�س\n"
 
-#: ../../netconnect.pm_.c:286
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "��ԡ"
 
-#: ../../netconnect.pm_.c:286
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "�ӧҹ����������?"
 
-#: ../../netconnect.pm_.c:292
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "�س����� ISDN �?"
 
-#: ../../netconnect.pm_.c:312
+#: ../../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 �������Һ��Դ ��س����͡˹��㹡��� PCI "
-"�˹�ҵ���"
+msgstr "���͡��� ISDN Ẻ PCI �������Һ��Դ ��س����͡˹��㹡��� PCI �˹�ҵ���"
 
-#: ../../netconnect.pm_.c:321
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "��辺���� ISDN PCI  ��س����͡�ҡ˹�ҵ���"
 
-#: ../../netconnect.pm_.c:369
-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:373 ../../standalone/drakgw_.c:232
-msgid "Choose the network interface"
-msgstr "���͡ network interface"
-
-#: ../../netconnect.pm_.c:374
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
-msgstr "��س����͡ Network Adaptor ����Ѻ��õ����� Internet"
-
-#: ../../netconnect.pm_.c:383 ../../netconnect.pm_.c:697
-#: ../../netconnect.pm_.c:842 ../../standalone/drakgw_.c:223
-msgid "Network interface"
-msgstr "Network interface"
-
-#: ../../netconnect.pm_.c:384
-msgid ""
-"\n"
-"Do you agree?"
-msgstr ""
-"\n"
-"�س����Ѻ�������"
-
-#: ../../netconnect.pm_.c:384
-msgid "I'm about to restart the network device:\n"
-msgstr "�����ѧ��������ӧҹ Network Device ����:\n"
-
-#: ../../netconnect.pm_.c:482
-msgid "ADSL configuration"
-msgstr "��ä͹�ԡ ADSL"
-
-#: ../../netconnect.pm_.c:483
-msgid "Do you want to start your connection at boot?"
-msgstr "�س��ͧ��õ�͵͹ boot �������"
-
-#: ../../netconnect.pm_.c:618
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "�س��ͧ������������ͧ�س��͡Ѻ����͹ء���?"
 
-#: ../../netconnect.pm_.c:623
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "��ͻ��蹢ͧ�����ع���Ѿ��"
 
-#: ../../netconnect.pm_.c:624 ../../standalone/draknet_.c:564
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:600
 msgid "Connection name"
 msgstr "���͡����������"
 
-#: ../../netconnect.pm_.c:625 ../../standalone/draknet_.c:565
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:601
 msgid "Phone number"
 msgstr "�����Ţ���Ѿ��"
 
-#: ../../netconnect.pm_.c:626 ../../standalone/draknet_.c:566
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:602
 msgid "Login ID"
 msgstr "�����Ţ��Шӵ�ǡ����͡�Թ"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
-msgid "Authentication"
-msgstr "��õ�Ǩ�ͺ�Է�������ҹ"
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
+msgid "CHAP"
+msgstr ""
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Script-based"
 msgstr "�ٻẺʤ�Ի��"
 
-#: ../../netconnect.pm_.c:628 ../../standalone/draknet_.c:568
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:604
 msgid "Terminal-based"
 msgstr "�ٻẺ�����Թ��"
 
-#: ../../netconnect.pm_.c:629 ../../standalone/draknet_.c:569
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:605
 msgid "Domain name"
 msgstr "��������"
 
-#: ../../netconnect.pm_.c:630 ../../standalone/draknet_.c:570
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:606
 msgid "First DNS Server (optional)"
 msgstr "��ÿ������ DNS ����ͧ�á (optional)"
 
-#: ../../netconnect.pm_.c:631 ../../standalone/draknet_.c:571
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:607
 msgid "Second DNS Server (optional)"
 msgstr "��ÿ������ DNS ����ͧ����ͧ (optional)"
 
-#: ../../netconnect.pm_.c:698
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"�����ѧ���������÷ӧҹ��������Ѻ���� network $netc->{NET_DEVICE} ��ŧ���?"
-
-#: ../../netconnect.pm_.c:742
+#: ../../network/netconnect.pm_.c:33
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -5307,7 +5248,7 @@ msgstr ""
 "\n"
 "�س����ö��ԡ�Դ������ͷӡ�û�Ѻ�觡�õԴ��ͧ͢�س����"
 
-#: ../../netconnect.pm_.c:742 ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can reconfigure your connection."
@@ -5315,11 +5256,11 @@ msgstr ""
 "\n"
 "�س����ö�͹�ԡ�к������������"
 
-#: ../../netconnect.pm_.c:742
+#: ../../network/netconnect.pm_.c:33
 msgid "You are currently connected to internet."
 msgstr "�س�Դ��͡Ѻ Internet ����"
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:36
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -5327,99 +5268,53 @@ msgstr ""
 "\n"
 "�س����ö�������� Internet ���ͷӡ����㢡��������������"
 
-#: ../../netconnect.pm_.c:745
+#: ../../network/netconnect.pm_.c:36
 msgid "You are not currently connected to Internet."
 msgstr "�س�ѧ������͡Ѻ Internet ����"
 
-#: ../../netconnect.pm_.c:749 ../../standalone/net_monitor_.c:81
+#: ../../network/netconnect.pm_.c:40
 msgid "Connect to Internet"
 msgstr "�������� Internet"
 
-#: ../../netconnect.pm_.c:751
+#: ../../network/netconnect.pm_.c:42
 msgid "Disconnect from Internet"
 msgstr "������������� Internet "
 
-#: ../../netconnect.pm_.c:753
+#: ../../network/netconnect.pm_.c:44
 msgid "Configure network connection (LAN or Internet)"
 msgstr "�͹�ԡ�к�������� (Lan ���� Internet)"
 
-#: ../../netconnect.pm_.c:756
+#: ../../network/netconnect.pm_.c:47
 msgid "Internet connection & configuration"
 msgstr "����������� Internet ��С�û�Ѻ��"
 
-#: ../../netconnect.pm_.c:808 ../../netconnect.pm_.c:957
-#: ../../netconnect.pm_.c:967 ../../netconnect.pm_.c:982
-msgid "Network Configuration Wizard"
-msgstr "Network Configuration Wizard"
-
-#: ../../netconnect.pm_.c:809
-msgid "External ISDN modem"
-msgstr "External ISDN modem"
-
-#: ../../netconnect.pm_.c:809
-msgid "Internal ISDN card"
-msgstr "Internal ISDN card"
-
-#: ../../netconnect.pm_.c:809
-msgid "What kind is your ISDN connection?"
-msgstr "��õԴ���Ẻ ISDN �ͧ�س��Ẻ�"
-
-#: ../../netconnect.pm_.c:830 ../../netconnect.pm_.c:879
-msgid "Connect to the Internet"
-msgstr "������ Internet "
-
-#: ../../netconnect.pm_.c:831
-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'"
+#: ../../network/netconnect.pm_.c:96
+#, fuzzy, c-format
+msgid "We are now going to configure the %s connection."
 msgstr ""
-"��õԴ����·���仢ͧ adsl ��� pppoe.\n"
-"�ҧ�����Ҩ��  pptp �չ��¤������  dhcp.\n"
-"��Ҥس����Һ ���͡ 'use pppoe'"
-
-#: ../../netconnect.pm_.c:833
-msgid "use dhcp"
-msgstr "�� dhcp"
-
-#: ../../netconnect.pm_.c:833
-msgid "use pppoe"
-msgstr "�� pppoe"
-
-#: ../../netconnect.pm_.c:833
-msgid "use pptp"
-msgstr "�� pptp"
-
-#: ../../netconnect.pm_.c:843
-#, c-format
-msgid "I'm about to restart the network device %s. Do you agree?"
-msgstr "�����ѧ��������ӧҹ Network Device %s ���� ��ŧ���?"
+"\n"
+"�س����ö��ԡ�Դ������ͷӡ�û�Ѻ�觡�õԴ��ͧ͢�س����"
 
-#: ../../netconnect.pm_.c:880
+#: ../../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 ""
-"��Դ�ͧ dhcp client ����ͧ�����������\n"
-"������͡���ͧ�鹤�� dhcpcd"
+"\n"
+"�س����ö��ԡ�Դ������ͷӡ�û�Ѻ�觡�õԴ��ͧ͢�س����"
 
-#: ../../netconnect.pm_.c:897
-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:898
-msgid "Do you want to restart the network"
-msgstr "�س��ͧ���������ӧҹ Network �����������"
-
-#: ../../netconnect.pm_.c:901
-#, fuzzy, c-format
-msgid ""
-"A problem occured while restarting the network: \n"
-"\n"
-"%s"
-msgstr "�س��ͧ���������ӧҹ Network �����������"
-
-#: ../../netconnect.pm_.c:931
+#: ../../network/netconnect.pm_.c:130
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -5429,7 +5324,7 @@ msgstr ""
 "���ͧ�ҡ�س���õԴ���Ẻ network �к� network �֧������������\n"
 "�� OK �����ѡ�Ҥ�Ҥ͹�ԡ������ �������͡ ¡��ԡ���ͻ�Ѻ������\n"
 
-#: ../../netconnect.pm_.c:958
+#: ../../network/netconnect.pm_.c:155
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -5441,72 +5336,111 @@ msgstr ""
 "��ҡ��ѧ�л�Ѻ�� internet/network \n"
 "��Ҥس����ͧ��� auto detection ��س�¡��ԡ checkbox.\n"
 
-#: ../../netconnect.pm_.c:960
+#: ../../network/netconnect.pm_.c:157
 msgid "Choose the profile to configure"
 msgstr "���͡ profile ���л�Ѻ��"
 
-#: ../../netconnect.pm_.c:961
+#: ../../network/netconnect.pm_.c:158
 msgid "Use auto detection"
 msgstr "�� auto detection"
 
-#: ../../netconnect.pm_.c:967 ../../printerdrake.pm_.c:19
+#: ../../network/netconnect.pm_.c:164
 msgid "Detecting devices..."
 msgstr "���ѧ��Ǩ�ͺ�ػ�ó�..."
 
-#: ../../netconnect.pm_.c:974
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 msgid "Normal modem connection"
 msgstr "��õԴ������� Modem ������"
 
-#: ../../netconnect.pm_.c:974
+#: ../../network/netconnect.pm_.c:175 ../../network/netconnect.pm_.c:184
 #, c-format
 msgid "detected on port %s"
 msgstr "�����ͺ� port %s"
 
-#: ../../netconnect.pm_.c:975
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 msgid "ISDN connection"
 msgstr "��õԴ������� ISDN"
 
-#: ../../netconnect.pm_.c:975
+#: ../../network/netconnect.pm_.c:176 ../../network/netconnect.pm_.c:185
 #, c-format
 msgid "detected %s"
 msgstr "�鹾� %s"
 
-#: ../../netconnect.pm_.c:976
-msgid "DSL (or ADSL) connection"
-msgstr "��õԴ���Ẻ DSL ���� ADSL"
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
+#, fuzzy
+msgid "ADSL connection"
+msgstr "LAN connection"
 
-#: ../../netconnect.pm_.c:976
+#: ../../network/netconnect.pm_.c:177 ../../network/netconnect.pm_.c:186
 #, c-format
 msgid "detected on interface %s"
 msgstr "�����ͺ� interface %s"
 
-#: ../../netconnect.pm_.c:977
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
 msgid "Cable connection"
 msgstr "cable connection"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:178 ../../network/netconnect.pm_.c:187
+#, fuzzy
+msgid "cable connection detected"
+msgstr "cable connection"
+
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "LAN connection"
 msgstr "LAN connection"
 
-#: ../../netconnect.pm_.c:978
+#: ../../network/netconnect.pm_.c:179 ../../network/netconnect.pm_.c:188
 msgid "ethernet card(s) detected"
 msgstr "ethernet card(s) ��辺"
 
-#: ../../netconnect.pm_.c:983
-msgid "How do you want to connect to the Internet?"
-msgstr "�س��ͧ��èе����� Internet ���Ը��"
+#: ../../network/netconnect.pm_.c:190
+#, fuzzy
+msgid "Choose the connection you want to configure"
+msgstr "���͡����ͧ��ͷ��س��ͧ�����"
 
-#: ../../netconnect.pm_.c:1000
+#: ../../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 ""
+
+#: ../../network/netconnect.pm_.c:215
+#, fuzzy
+msgid "Internet connection"
+msgstr "����������͡Ѻ Internet Ẻ sharing"
+
+#: ../../network/netconnect.pm_.c:221
+msgid "Do you want to start the connection at boot?"
+msgstr "�س��ͧ��õ�͵͹ boot �������"
+
+#: ../../network/netconnect.pm_.c:239
+msgid "Network configuration"
+msgstr "��ä͹�ԡ�к��������"
+
+#: ../../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 "�س��ͧ���������ӧҹ Network �����������"
+
+#: ../../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/network ���º��������\n"
 "\n"
-"��ҵ�ҧ�ж١���������ǹ��"
+"��ҵ�ҧ�ж١���������ǹ��\n"
 
-#: ../../netconnect.pm_.c:1003
+#: ../../network/netconnect.pm_.c:250
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -5514,31 +5448,7 @@ msgstr ""
 "����ͷء���ҧ������� ���й�����ҹ������ӧҹ X windows ����\n"
 "���ͻ�ͧ�ѹ�ѭ�� hostname ����Ҩ�Դ�����"
 
-#: ../../network.pm_.c:253
-msgid "no network card found"
-msgstr "��辺�����������"
-
-#: ../../network.pm_.c:277 ../../network.pm_.c:387
-msgid "Configuring network"
-msgstr "���ѧ�͹�ԡ�к��������"
-
-#: ../../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 ""
-"�ô�����ͧ͢��ʵ�\n"
-"���ͧ͢��ʵ����������ٻẺ (���������������)\n"
-"������ҧ�� ``mybox.mylab.yco.com''\n"
-"�س�Ҩ������� IP �ͧࡵ������¶�Ҥس������ͧ����˹�ҷ����ࡵ��������"
-
-#: ../../network.pm_.c:282 ../../network.pm_.c:392
-msgid "Host name"
-msgstr "������ʵ�:"
-
-#: ../../network.pm_.c:319
+#: ../../network/network.pm_.c:283
 msgid ""
 "WARNING: This device has been previously configured to connect to the "
 "Internet.\n"
@@ -5549,7 +5459,7 @@ msgstr ""
 "�س����ö����Ѻ��ҵ�ҧ����ͷӡ����㢤�ҵ�ҧ��ҧ��ҧ���\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"
@@ -5559,38 +5469,38 @@ msgstr ""
 "�������������ҧ����ö��������������� IP ��ٻẺ����Ţ��蹴��¨ش\n"
 "(dotted-decimal notation) ������ҧ�� 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 " (driver $module)"
+#: ../../network/network.pm_.c:298
+#, c-format
+msgid " (driver %s)"
+msgstr " (driver %s)"
 
-#: ../../network.pm_.c:336 ../../standalone/draknet_.c:231
-#: ../../standalone/draknet_.c:425
+#: ../../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:426
+#: ../../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"
@@ -5602,72 +5512,173 @@ msgstr ""
 "������ҧ�� ``mybox.mylab.yco.com''\n"
 "�س�Ҩ������� IP �ͧࡵ������¶�Ҥس������ͧ����˹�ҷ����ࡵ��������"
 
-#: ../../network.pm_.c:393
+#: ../../network/network.pm_.c:356
 msgid "DNS server"
 msgstr "��������� DNS"
 
-#: ../../network.pm_.c:394 ../../standalone/draknet_.c:563
+#: ../../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:560
+#: ../../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 "�س��ͧ��÷��ͺ������ Internet ����ǹ���������"
+
+#: ../../network/tools.pm_.c:43 ../../standalone/draknet_.c:189
+msgid "Testing your connection..."
+msgstr "���ͺ connection..."
+
+#: ../../network/tools.pm_.c:49 ../../standalone/draknet_.c:220
+msgid "The system is now connected to Internet."
+msgstr "�Դ������ Internet ���º����"
+
+#: ../../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 ""
+"�������ö������ Internet \n"
+"�ͧ�ӡ�ä͹�ԡ�����ա����"
+
+#: ../../network/tools.pm_.c:75
+msgid "Connection Configuration"
+msgstr "��ä͹�ԡ Connection"
+
+#: ../../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 "Card IRQ"
+
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:587
+msgid "Card mem (DMA)"
+msgstr "Card mem (DMA)"
+
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:588
+msgid "Card IO"
+msgstr "Card IO"
+
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:589
+msgid "Card IO_0"
+msgstr "Card IO_0"
+
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:590
+msgid "Card IO_1"
+msgstr "Card 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 "���ͼ������ԡ�� (ex KSC)"
+
+#: ../../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 "�������ԡ�� dns 1 (optional)"
+
+#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:595
+msgid "Provider dns 2 (optional)"
+msgstr "�������ԡ�� dns 2 (optional)"
+
+#: ../../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
+#, fuzzy
+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 "Account Login (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 "Extended partition not supported on this platform"
 
-#: ../../partition_table.pm_.c:578
+#: ../../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 ""
 "�س�ժ�ͧ��ҧ㹵��ҧ����Ԫ��  ��������������ҹ��ͧ��ҧ���\n"
-"�����䢻ѭ������ö���������������վ���Ԫ�� "
-"��������ͧ���仵�ͷ��¾���Ԫ��Ẻ extended"
-
-#: ../../partition_table.pm_.c:672
-#, c-format
-msgid "Error reading file %s"
-msgstr "�ջѭ�ҡѺ�����ҹ���������� %s"
+"�����䢻ѭ������ö���������������վ���Ԫ�� ��������ͧ���仵�ͷ��¾���Ԫ��Ẻ extended"
 
-#: ../../partition_table.pm_.c:679
+#: ../../partition_table.pm_.c:744
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "��á��׹�ҡ��� %s �������: %s"
 
-#: ../../partition_table.pm_.c:681
+#: ../../partition_table.pm_.c:746
 msgid "Bad backup file"
 msgstr "������Ѿ�ջѭ��"
 
-#: ../../partition_table.pm_.c:703
+#: ../../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"
@@ -5697,49 +5708,214 @@ 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 "Remote CUPS server"
+
+#: ../../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 "����ͧ�������к� Network (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/�Թ���� 95/98/NT"
 
-#: ../../printer.pm_.c:26
-msgid "NetWare"
-msgstr "������"
+#: ../../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 SERVER �س�����繵�ͧ��Ѻ������ͧ�����\n"
+"㹵͹���  ����ͧ�����ж١�����ͧ\n"
+"�ó��բ��ʧ��� ��س����͡ \"Remote CUPS server\""
+
+#: ../../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 "���͡����� default"
+
+#: ../../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 "Mouse"
+
+#: ../../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 ���������ٻẺ 1.2.3.4"
+
+#: ../../printerdrake.pm_.c:134 ../../printerdrake.pm_.c:541
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Port number ����繵���Ţ"
+
+#: ../../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 "Port"
+
+#: ../../printerdrake.pm_.c:149
+#, fuzzy
+msgid "Automatic CUPS configuration"
+msgstr "Boot Style Configuration"
+
+#: ../../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"
@@ -5747,37 +5923,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 drivers database..."
+
+#: ../../printerdrake.pm_.c:312
 msgid "Remote lpd Printer Options"
 msgstr "��ͻ��蹢ͧ����ͧ�����Ẻ�����"
 
-#: ../../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"
 "�ͧ������ʵ�������ԡ������ͧ������� ��Ъ��ͤ�Ǣͧ�����������\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
+#, fuzzy
+msgid "Remote host name missing!"
+msgstr "������ʵ������"
 
-#: ../../printerdrake.pm_.c:88
+#: ../../printerdrake.pm_.c:324
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "������ʵ������"
+
+#: ../../printerdrake.pm_.c:392
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "��ͻ��蹢ͧ����ͧ�����Ẻ SMB (����ͧ�������к��Թ���� 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"
@@ -5791,29 +5990,37 @@ msgstr ""
 "���ͧ͢����ͧ��������ͧ����� (share name) ��Ъ��ͧ͢����� (username)\n"
 "���ʼ�ҹ (password) ��Т����Ţͧ����줡��� (workgroup) ����"
 
-#: ../../printerdrake.pm_.c:94
+#: ../../printerdrake.pm_.c:398
 msgid "SMB server host"
 msgstr "������ʵ�ͧ SMB server"
 
-#: ../../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 "���ͷ����㹡��� (sharename)"
 
-#: ../../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:403
 msgid "Workgroup"
 msgstr "����졡��� (workgroup)"
 
-#: ../../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 "��ͻ��蹢ͧ����ͧ�������к�������"
 
-#: ../../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."
@@ -5823,59 +6030,228 @@ msgstr ""
 "��ʵ�Ẻ TCP/IP) ��Т����Ū��ͤ�Ǣͧ����ͧ��������ͧ�����\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 ""
+
+#: ../../printerdrake.pm_.c:488
+msgid "NCP queue name missing!"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:527
 msgid "Socket Printer Options"
 msgstr "��ͻ��蹢ͧ����ͧ������Ť��"
 
-#: ../../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 ""
 "To print to a socket printer, you need to provide the\n"
 "hostname of the printer and optionally the port number."
 
-#: ../../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 "Port"
+#: ../../printerdrake.pm_.c:537
+#, fuzzy
+msgid "Printer host name missing!"
+msgstr "���ͧ͢����ͧ�����"
 
-#: ../../printerdrake.pm_.c:159
-msgid "You can specify directly the URI to access the printer with CUPS."
-msgstr "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:192 ../../printerdrake.pm_.c:244
-msgid "What type of printer do you have?"
+#: ../../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 "��������ͧ�����"
+
+#: ../../printerdrake.pm_.c:686
+msgid "Description"
+msgstr "��������´"
+
+#: ../../printerdrake.pm_.c:687
+msgid "Location"
+msgstr "���˹�"
+
+#: ../../printerdrake.pm_.c:701
+#, fuzzy
+msgid "Preparing printer database ..."
+msgstr "��ҹ CUPS drivers database..."
+
+#: ../../printerdrake.pm_.c:793
+#, fuzzy
+msgid "Printer model selection"
+msgstr "���͡����������͡Ѻ����ͧ�����"
+
+#: ../../printerdrake.pm_.c:794
+#, fuzzy
+msgid "Which printer model do you have?"
 msgstr "�س������ͧ����쪹Դ�?"
 
-#: ../../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 "��ä͹�ԡ 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 ""
+
+#: ../../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 "�س��ͧ��þ���췴�ͺ�������?"
 
-#: ../../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 "�� ��������д�ɷ��ͺ����ͧẺ"
+
+#: ../../printerdrake.pm_.c:1159
+#, fuzzy
+msgid "Print"
+msgstr "����ͧ�����"
+
+#: ../../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 "���ѧ������д�ɷ��ͺ"
+
+#: ../../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"
@@ -5884,234 +6260,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 ""
 "�蹷��ͺ��þ������١��价������ͧ���������\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 "�� ��������д�ɷ��ͺẺ�ʵ�ʤ�Ի��"
+#: ../../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
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "��ҹ CUPS drivers database..."
 
-#: ../../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 "Print text as 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 "���Ӣ�ͤ��� 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 "�ӹǹ˹�ҵ�ͤ���"
+#: ../../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 "���/���� margins ˹��� 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 ""
 
-#: ../../printerdrake.pm_.c:289
-msgid "Top/Bottom margins in points (1/72 of inch)"
-msgstr "��/��ҧ margins ˹��� points (1/72 of inch)"
+#: ../../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 "Extra GhostScript options"
+#: ../../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 ""
 
-#: ../../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 ""
-"���仹���繢������͡�þ����\n"
-"�س����ö����������������䢢����ŷ������"
 
-#: ../../printerdrake.pm_.c:370
-msgid "CUPS starting"
-msgstr "CUPS starting"
+#: ../../printerdrake.pm_.c:1398
+#, fuzzy
+msgid "New printer name"
+msgstr "���������ͧ�����"
+
+#: ../../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 drivers database..."
 
-#: ../../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 "���ͺ connection..."
 
-#: ../../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 SERVER �س�����繵�ͧ��Ѻ������ͧ�����\n"
-"㹵͹���  ����ͧ�����ж١�����ͧ\n"
-"�ó��բ��ʧ��� ��س����͡ \"Remote CUPS server\""
 
-#: ../../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 SERVER �س�����繵�ͧ��Ѻ������ͧ�����\n"
-"㹵͹���  ����ͧ�����ж١�����ͧ\n"
-"¡��鹤س�� server �� network ��� �óչ�鹤س��ͧ\n"
-"�к� IP ADDRESS ��� port number ���Ѻ CUPS server"
 
-#: ../../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 "Port number ����繵���Ţ"
+#: ../../printerdrake.pm_.c:1516
+#, fuzzy
+msgid "Restarting printing system ..."
+msgstr "�������ͧ��þ���쪹Դ�˹���س��ͧ���"
 
-#: ../../printerdrake.pm_.c:451 ../../printerdrake.pm_.c:480
-msgid "Remove queue"
-msgstr "ź���"
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "high"
+msgstr "�٧"
 
-#: ../../printerdrake.pm_.c:454
+#: ../../printerdrake.pm_.c:1548
+#, fuzzy
+msgid "paranoid"
+msgstr "Paranoid"
+
+#: ../../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 ""
-"����ͧ�����ء����ͧ��ͧ��ê���\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
+#, fuzzy
+msgid "Select Printer Spooler"
+msgstr "���͡����������͡Ѻ����ͧ�����"
+
+#: ../../printerdrake.pm_.c:1728
+#, fuzzy
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "�������ͧ��þ���쪹Դ�˹���س��ͧ���"
+
+#: ../../printerdrake.pm_.c:1759
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\" ..."
+msgstr "��ä͹�ԡ����ͧ�����"
 
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:1806 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:2026 ../../printerdrake.pm_.c:2088
+msgid "Printer options"
+msgstr "��ͻ��蹢ͧ����ͧ�����"
+
+#: ../../printerdrake.pm_.c:1815
+#, fuzzy
+msgid "Preparing PrinterDrake ..."
+msgstr "��ҹ CUPS drivers database..."
+
+#: ../../printerdrake.pm_.c:1845
+#, fuzzy
+msgid "Would you like to configure printing?"
+msgstr "�س��ͧ��ä͹�ԡ����ͧ���������������"
+
+#: ../../printerdrake.pm_.c:1857
+msgid "Printing system: "
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1879
+msgid ""
+"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 ""
+
+#: ../../printerdrake.pm_.c:1885 ../../standalone/draknet_.c:301
+msgid "Normal Mode"
+msgstr "����������"
+
+#: ../../printerdrake.pm_.c:1891 ../../printerdrake.pm_.c:2010
+msgid " (Default)"
+msgstr " (Default)"
+
+#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1935
+#, fuzzy
+msgid "Printer(s) on remote CUPS server(s)"
+msgstr "Remote CUPS server"
+
+#: ../../printerdrake.pm_.c:1896 ../../printerdrake.pm_.c:1936
+#, fuzzy
+msgid "Printer(s) on remote server(s)"
+msgstr "Remote CUPS server"
+
+#: ../../printerdrake.pm_.c:1898 ../../printerdrake.pm_.c:1919
+#: ../../printerdrake.pm_.c:1922 ../../printerdrake.pm_.c:1971
+#, fuzzy
+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 "�س��ͧ��÷��ͺ��ä͹�ԡ�������"
+
+#: ../../printerdrake.pm_.c:2003
+#, fuzzy
+msgid "Modify printer configuration"
+msgstr "��ä͹�ԡ Internet"
+
+#: ../../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 ""
-"��Թ���� (��Թ�����繷���ҹ�����������������͹������ͧ�����)\n"
-"��ͧ�������ա�õ�駪��� (���Ԩ��� lp) ������硷��շ���红�����\n"
-"�س��ͧ��õ�駪��� ��С�˹����硷�������繤��㴺�ҧ?"
 
-#: ../../printerdrake.pm_.c:489
-msgid "Name of queue"
-msgstr "���ͧ͢���"
+#: ../../printerdrake.pm_.c:2012
+msgid "Do it!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:490
-msgid "Spool directory"
-msgstr "ʻ�����硷���"
+#: ../../printerdrake.pm_.c:2015 ../../printerdrake.pm_.c:2062
+#, fuzzy
+msgid "Printer connection type"
+msgstr "����������͡Ѻ Internet Ẻ sharing"
 
-#: ../../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 drivers database..."
+
+#: ../../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 "�س��ͧ���������ӧҹ Network �����������"
+
+#: ../../printerdrake.pm_.c:2105
+#, fuzzy, c-format
+msgid "Removing printer \"%s\" ..."
+msgstr "��ҹ CUPS drivers database..."
+
+#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
+#: ../../proxy.pm_.c:78
+#, fuzzy
+msgid "Proxy configuration"
+msgstr "��ä͹�ԡ Proxies"
+
+#: ../../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 "��Ңͧ Proxy ��è��� http://..."
+
+#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
+#, fuzzy
+msgid "The port part should be numeric"
+msgstr "Port 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 "��Ңͧ Proxy ��è��� ftp://..."
+
+#: ../../proxy.pm_.c:79
+msgid ""
+"Please enter proxy login and password, if any.\n"
+"Leave it blank if you don't want login/passwd"
+msgstr ""
+
+#: ../../proxy.pm_.c:80
+#, fuzzy
+msgid "login"
+msgstr "Autologin"
+
+#: ../../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 "���ʼ�ҹ�������͹�ѹ"
+
+#: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "�������ö��������Ԫ���� _formatted_ 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 failed"
 
-#: ../../raid.pm_.c:128
+#: ../../raid.pm_.c:136
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid failed (maybe raidtools are missing?)"
 
-#: ../../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 ������������Ѻ������ҷӧҹ"
 
-#: ../../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."
@@ -6119,13 +6865,13 @@ msgstr ""
 "apmd ������������ʶҹТͧ battery \n"
 "�ѹ����ö�лԴ����ͧ��������� battery ��俹���"
 
-#: ../../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 ""
 
-#: ../../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 "
@@ -6136,7 +6882,7 @@ msgstr ""
 "vixie cron ������������ö���Ѻ UNIX cron �������֧����\n"
 "�к�������ʹ������ option ��û�Ѻ������"
 
-#: ../../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 "
@@ -6147,19 +6893,19 @@ msgstr ""
 "�ѹ�ѧ���·��������ö�� cut-and-paste ��� popup-menu \n"
 "����"
 
-#: ../../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 ��� World Wide Web server"
 
-#: ../../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 "
@@ -6173,13 +6919,13 @@ msgstr ""
 "ftp rsh ��� rlogin  ���¡��ԡ inetd �з�������������������ѹ�Ѻ\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 ""
 
-#: ../../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"
@@ -6189,23 +6935,23 @@ msgstr ""
 "/etc/sysconfig/keyboard  ������ö���͡������ kbdconfig\n"
 "�س��û��������ѹ�ӧҹ�����ͧ�����"
 
-#: ../../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)."
@@ -6213,13 +6959,13 @@ msgstr ""
 "lpd ��� print daemon �����繵�ͧ�ն�ҵ�ͧ������ lpr �ӧҹ�١��ͧ\n"
 "����ԧ�����ѹ��� server ���Ѵ����觧ҹ����������ͧ�����"
 
-#: ../../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."
@@ -6227,7 +6973,7 @@ msgstr ""
 "named (BIND) ��� Domain Name Server (DNS) ��˹�ҷ���ŧ����\n"
 "host names �� IP addresses."
 
-#: ../../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."
@@ -6235,7 +6981,7 @@ msgstr ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 
-#: ../../services.pm_.c:54
+#: ../../services.pm_.c:53
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -6243,7 +6989,7 @@ msgstr ""
 "Activates/Deactivates network interfaces ������ ���١������\n"
 "������ӧҹ�͹ boot"
 
-#: ../../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"
@@ -6252,7 +6998,7 @@ msgstr ""
 "NFS ��� protocol �����ѹ���ҧ������������Ѻ��������캹TCP/IP networks.\n"
 "�ѹ����÷ӧҹ�ͧNFS server ����к����� /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."
@@ -6260,17 +7006,17 @@ msgstr ""
 "NFS ��� protocol �����ѹ���ҧ������������Ѻ��������캹TCP/IP networks.\n"
 "�ѹ����÷ӧҹ�ͧNFS server "
 
-#: ../../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 "
@@ -6280,7 +7026,7 @@ msgstr ""
 "PCMCIA ʹѺʹع��÷ӧҹ�ͧ�ػ�ó���������ҧ��\n"
 "ethernet ���� modem 㹤���������Ẻ����"
 
-#: ../../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 "
@@ -6291,7 +7037,7 @@ msgstr ""
 "protocols �� NFS ��� NIS Portmap server ��ͧ�ӧҹ������ͧ\n"
 "����˹�ҷ���� server �ͧ protocal ������¡���÷ӧҹẺ 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."
@@ -6299,80 +7045,118 @@ 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."
 msgstr ""
 
-#: ../../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"
 "routing protocols are needed for complex networks."
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../services.pm_.c:85
+#: ../../services.pm_.c:84
 #, fuzzy
 msgid "Launch the sound system on your machine"
 msgstr "�ѹ X-Window �����������ӧҹ"
 
-#: ../../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 ""
 
-#: ../../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 "����������ش X Font Server �͹ boot ��� ��ԡ"
 
-#: ../../services.pm_.c:118
+#: ../../services.pm_.c:114 ../../services.pm_.c:156
 msgid "Choose which services should be automatically started at boot time"
 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 "System mode"
+
 #: ../../services.pm_.c:137
+#, fuzzy
+msgid "Remote Administration"
+msgstr "��ͻ��蹢ͧ����ͧ�����Ẻ�����"
+
+#: ../../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
 msgid "running"
 msgstr "���ѧ�ӧҹ"
 
-#: ../../services.pm_.c:137
+#: ../../services.pm_.c:198
 msgid "stopped"
 msgstr "��ش"
 
-#: ../../services.pm_.c:151
+#: ../../services.pm_.c:212
 msgid "Services and deamons"
-msgstr "Services and deamons"
+msgstr ""
 
-#: ../../services.pm_.c:156
+#: ../../services.pm_.c:217
 msgid ""
 "No additionnal information\n"
 "about this service, sorry."
@@ -6380,11 +7164,16 @@ msgstr ""
 "����բ������������\n"
 "����Ѻ��ú�ԡ�ù�� ���ɤ�Ѻ"
 
-#: ../../services.pm_.c:163
+#: ../../services.pm_.c:224
 msgid "On boot"
 msgstr "��� boot"
 
-#: ../../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"
@@ -6392,15 +7181,66 @@ msgstr ""
 "������������ö��ҹ���ҧ����Ԫ���� ������㹵��ҧ���١��ͧ :(\n"
 "������о��������������Ԫ�蹷���ջѭ�����"
 
-#: ../../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 "Boot Style Configuration"
+
+#: ../../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 Ẻ sharing"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:119
 msgid "Internet Connection Sharing currently enabled"
 msgstr "����������� internet Ẻ share ��ӧҹ����"
 
-#: ../../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"
@@ -6408,31 +7248,31 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:123
+#: ../../standalone/drakgw_.c:124
 msgid "disable"
 msgstr "disable"
 
-#: ../../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
+#: ../../standalone/drakgw_.c:127
 msgid "Disabling servers..."
 msgstr "¡��ԡ��÷ӧҹ�ͧ server"
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:135
 msgid "Internet connection sharing is now disabled."
 msgstr "����������͡Ѻ Internet Ẻ sharing �١¡��ԡ����"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:144
 msgid "Internet Connection Sharing currently disabled"
 msgstr "��õԴ��� internet Ẻ share �١¡��ԡ����"
 
-#: ../../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"
@@ -6440,27 +7280,19 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:148
+#: ../../standalone/drakgw_.c:149
 msgid "enable"
 msgstr "enable"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:156
 msgid "Enabling servers..."
 msgstr "������ӧҹ server"
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:161
 msgid "Internet connection sharing is now enabled."
 msgstr "����������͡Ѻ Internet Ẻ sharing ������ӧҹ����"
 
-#: ../../standalone/drakgw_.c:168
-msgid "Config file content could not be interpreted."
-msgstr ""
-
-#: ../../standalone/drakgw_.c:168
-msgid "Unrecognized config file"
-msgstr "Unrecognized config file"
-
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:182
 #, fuzzy
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -6476,28 +7308,31 @@ msgstr ""
 "\n"
 "�س��ͧ������������� internet ���������������\n"
 
-#: ../../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 "������ػ�ó� Network ������ͧ�س"
 
-#: ../../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 ""
-"�������ö��Ǩ�� network adapter ������ͧ��� ��س��ѹ�������Ѻ�� hardware"
+msgstr "�������ö��Ǩ�� network adapter ������ͧ��� ��س��ѹ�������Ѻ�� hardware"
 
 #: ../../standalone/drakgw_.c:224
+msgid "Network interface"
+msgstr "Network interface"
+
+#: ../../standalone/drakgw_.c:225
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -6512,50 +7347,46 @@ msgstr ""
 "\n"
 "�����ѧ���� adapter ���Ѻ�к� LAN"
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:234
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "��س����͡ network adapter ������Ѻ�к� LAN"
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:243
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
-msgstr ""
-"���ѧ network adapter �����ա�û�Ѻ�����º�������� "
-"����зӡ�û�Ѻ������"
+msgstr "���ѧ network adapter �����ա�û�Ѻ�����º�������� ����зӡ�û�Ѻ������"
 
-#: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "�դ����Ѵ��駢ͧ LAN address �����㹤͹�ԡ�Ѩ�غѹ� $_!\n"
+#: ../../standalone/drakgw_.c:254
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "�դ����Ѵ��駢ͧ LAN address �����㹤͹�ԡ�Ѩ�غѹ� %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."
 msgstr ""
 
-#: ../../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 "���ѧ��Ѻ�� scripts �Դ�������� ���������ӧҹ servers..."
 
-#: ../../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 "
@@ -6564,24 +7395,24 @@ msgstr ""
 "�ء���ҧ��١�ӡ�û�Ѻ�����º��������\n"
 "�س����ö���Թ����๵����������������� LAN ���� (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
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "����ա���������͡Ѻ Internet Ẻ sharing"
 
-#: ../../standalone/drakgw_.c:615
+#: ../../standalone/drakgw_.c:624
 #, fuzzy
 msgid "Internet connection sharing configuration"
 msgstr "����������� Internet ��С�û�Ѻ��"
 
-#: ../../standalone/drakgw_.c:622
+#: ../../standalone/drakgw_.c:631
 #, fuzzy, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -6596,84 +7427,83 @@ msgstr ""
 "\n"
 "�� ``Ok'' ��Ҥس��ͧ����������÷ӧҹ�ͧ setup wizard"
 
-#: ../../standalone/draknet_.c:59
+#: ../../standalone/draknet_.c:79
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "��ä͹�ԡ�к�������� (%d adapters)"
 
-#: ../../standalone/draknet_.c:66 ../../standalone/draknet_.c:537
+#: ../../standalone/draknet_.c:86 ../../standalone/draknet_.c:573
 msgid "Profile: "
 msgstr "Profile: "
 
-#: ../../standalone/draknet_.c:74
+#: ../../standalone/draknet_.c:94
 msgid "Del profile..."
 msgstr "ź profile..."
 
-#: ../../standalone/draknet_.c:80
+#: ../../standalone/draknet_.c:100
 msgid "Profile to delete:"
 msgstr "profile ����ͧ���ź:"
 
-#: ../../standalone/draknet_.c:108
+#: ../../standalone/draknet_.c:128
 msgid "New profile..."
 msgstr "profile ����..."
 
-#: ../../standalone/draknet_.c:114
-msgid "Name of the profile to create:"
-msgstr "���ͧ͢ profile �������ҧ:"
+#: ../../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 "������ʵ�:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:167
 msgid "Internet access"
 msgstr "��õԴ��� internet"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:180
 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 "Interface:"
 
-#: ../../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
 msgid "Connected"
 msgstr "������������"
 
-#: ../../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 "�����������"
 
-#: ../../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 "���ͺ connection..."
 
-#: ../../standalone/draknet_.c:199
+#: ../../standalone/draknet_.c:223
 msgid "Closing your connection..."
 msgstr "����õԴ���..."
 
-#: ../../standalone/draknet_.c:204
+#: ../../standalone/draknet_.c:228
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -6681,120 +7511,115 @@ msgid ""
 "in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:231
 msgid "The system is now disconnected."
 msgstr "����ͧ�س����ԡ��õԴ�������"
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:243
 msgid "Configure Internet Access..."
 msgstr "��Ѻ�觡�õԴ������ internet"
 
-#: ../../standalone/draknet_.c:226 ../../standalone/draknet_.c:409
+#: ../../standalone/draknet_.c:250 ../../standalone/draknet_.c:446
 msgid "LAN configuration"
 msgstr "��û�Ѻ�� LAN"
 
-#: ../../standalone/draknet_.c:231
-msgid "Adapter"
-msgstr "Adapter"
-
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Driver"
 msgstr "Driver"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Interface"
 msgstr "Interface"
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:255
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../../standalone/draknet_.c:250
+#: ../../standalone/draknet_.c:255
+#, fuzzy
+msgid "State"
+msgstr "ʶҹ�:"
+
+#: ../../standalone/draknet_.c:267
 msgid "Configure Local Area Network..."
 msgstr "��Ѻ���к������������..."
 
-#: ../../standalone/draknet_.c:283
-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
 msgid "Please Wait... Applying the configuration"
 msgstr "��س����ѡ���� ..."
 
-#: ../../standalone/draknet_.c:389
+#: ../../standalone/draknet_.c:428
 msgid ""
-"You don't any configured interface.\n"
+"You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:413
+#: ../../standalone/draknet_.c:450
 msgid "LAN Configuration"
 msgstr "��û�Ѻ�� LAN"
 
-#: ../../standalone/draknet_.c:421
+#: ../../standalone/draknet_.c:457
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
-#: ../../standalone/draknet_.c:427
+#: ../../standalone/draknet_.c:463
 msgid "Boot Protocol"
 msgstr "Boot Protocol"
 
-#: ../../standalone/draknet_.c:428
+#: ../../standalone/draknet_.c:464
 msgid "Started on boot"
 msgstr "������ӧҹ�͹ boot"
 
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:465
 msgid "DHCP client"
 msgstr "DHCP client"
 
-#: ../../standalone/draknet_.c:464 ../../standalone/draknet_.c:468
-msgid "Disable"
-msgstr "¡��ԡ�ӧҹ"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "activate now"
+msgstr "��礷տ"
 
-#: ../../standalone/draknet_.c:464 ../../standalone/draknet_.c:468
-msgid "Enable"
-msgstr "������ӧҹ"
+#: ../../standalone/draknet_.c:489 ../../standalone/draknet_.c:491
+#, fuzzy
+msgid "desactivate now"
+msgstr "��礷տ"
 
-#: ../../standalone/draknet_.c:502
+#: ../../standalone/draknet_.c:538
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:526
+#: ../../standalone/draknet_.c:562
 msgid "Internet connection configuration"
 msgstr "��û�Ѻ�觡�õԴ������ internet"
 
-#: ../../standalone/draknet_.c:530
+#: ../../standalone/draknet_.c:566
 msgid "Internet Connection Configuration"
 msgstr "��û�Ѻ�觡�õԴ������ internet"
 
-#: ../../standalone/draknet_.c:539
+#: ../../standalone/draknet_.c:575
 msgid "Connection type: "
 msgstr "��Դ�����������"
 
-#: ../../standalone/draknet_.c:545
+#: ../../standalone/draknet_.c:581
 msgid "Parameters"
 msgstr "Parameters"
 
-#: ../../standalone/draknet_.c:558
-msgid "Provider dns 1 (optional)"
-msgstr "�������ԡ�� dns 1 (optional)"
-
-#: ../../standalone/draknet_.c:559
-msgid "Provider dns 2 (optional)"
-msgstr "�������ԡ�� dns 2 (optional)"
-
-#: ../../standalone/draknet_.c:572
+#: ../../standalone/draknet_.c:608
 msgid "Ethernet Card"
 msgstr "Ethernet Card"
 
-#: ../../standalone/draknet_.c:573
+#: ../../standalone/draknet_.c:609
 msgid "DHCP Client"
 msgstr "DHCP Client"
 
@@ -6849,15 +7674,30 @@ msgid ""
 "Security features are at their maximum."
 msgstr ""
 
-#: ../../standalone/draksec_.c:52
+#: ../../standalone/draksec_.c:65
+#, fuzzy
+msgid "Security level"
+msgstr "���͡�дѺ�к��ѡ�Ҥ�����ʹ���"
+
+#: ../../standalone/draksec_.c:67
+#, fuzzy
+msgid "Use libsafe for servers"
+msgstr "���͡�ͻ��������������Ѻ���������"
+
+#: ../../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: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 "���͡����ͧ��ͷ��س��ͧ�����"
 
@@ -6883,85 +7723,14 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "�������ö����� live upgrade !!!\n"
 
-#: ../../standalone/mousedrake_.c:39
+#: ../../standalone/mousedrake_.c:58
 msgid "no serial_usb found\n"
 msgstr "��辺 serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:43
+#: ../../standalone/mousedrake_.c:62
 msgid "Emulate third button?"
 msgstr "��ͧ��è��ͧ��������������������������?"
 
-#: ../../standalone/net_monitor_.c:40 ../../standalone/net_monitor_.c:52
-#, fuzzy
-msgid "Network Monitoring"
-msgstr "��ä͹�ԡ�к��������"
-
-#: ../../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 "Mouse"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Connecting to Internet "
-msgstr "�������� Internet"
-
-#: ../../standalone/net_monitor_.c:100 ../../standalone/net_monitor_.c:104
-#, fuzzy
-msgid "Disconnecting from Internet "
-msgstr "������������� Internet "
-
-#: ../../standalone/net_monitor_.c:114
-#, fuzzy
-msgid "Disconnection from Internet failed."
-msgstr "������������� Internet "
-
-#: ../../standalone/net_monitor_.c:115
-#, fuzzy
-msgid "Disconnection from Internet complete."
-msgstr "������������� Internet "
-
-#: ../../standalone/net_monitor_.c:117
-#, fuzzy
-msgid "Connection complete."
-msgstr "���͡����������"
-
-#: ../../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 "������������"
-
-#: ../../standalone/net_monitor_.c:222
-#, fuzzy
-msgid "Disconnect"
-msgstr "¡��ԡ�Դ���..."
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "��û�Ѻ�� firewall"
@@ -6985,16 +7754,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 "���͡���ҷ��س��"
+
+#: ../../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 "���͡�������"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "�к�������ͧ�ѹ"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "���Ѿ�к����"
+
+#: ../../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 "�Դ����к�"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "���������"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "�͹�ԡ�к��������"
+
+#: ../../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"
+
+#: ../../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"
@@ -7005,7 +7842,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"
@@ -7013,7 +7850,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"
@@ -7021,7 +7858,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"
@@ -7030,7 +7867,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"
@@ -7038,7 +7875,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"
@@ -7046,7 +7883,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"
@@ -7054,7 +7891,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"
@@ -7062,7 +7899,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"
@@ -7070,7 +7907,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"
@@ -7079,7 +7916,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"
@@ -7091,273 +7928,759 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../tinyfirewall.pm_.c:83
+#: ../../tinyfirewall.pm_.c:82
 #, fuzzy, c-format
 msgid "Can't open %s: %s\n"
 msgstr "Adapter %s: %s"
 
-#: ../../tinyfirewall.pm_.c:85
+#: ../../tinyfirewall.pm_.c:84
 #, fuzzy, c-format
 msgid "Can't open %s for writing: %s\n"
 msgstr "�Դ��ͼԴ��Ҵ㹡���Դ %s ����Ѻ�����¹: %s"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clients for different protocols including ssh"
+msgid "Web/FTP"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "�Ѳ�ҫͿ������ (Development)"
+#, fuzzy
+msgid "Network Computer (client)"
+msgstr "����ͧ�������к� Network (Socket)"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Workstation"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+#, fuzzy
+msgid "Office"
+msgstr "��"
 
 #: ../../share/compssUsers:999
-msgid "Personal Information Management"
-msgstr "Personnal Information Management"
+#, fuzzy
+msgid "Gnome Workstation"
+msgstr "Workstation ���ӧҹ"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Graphics"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "����ͧ�������Ѻ Palm Pilot ���� Visor"
 
 #: ../../share/compssUsers:999
-msgid "Internet"
-msgstr "�?�?ணயம�?"
+#, fuzzy
+msgid "Workstation"
+msgstr "Workstation ���ӧҹ"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Network Computer (client)"
+msgid "Firewall/Router"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Audio-related tools: mp3 or midi players, mixers, etc"
+msgid "Domain Name and Network Information Server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet station"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedia station"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+#, fuzzy
+msgid "KDE Workstation"
+msgstr "Workstation ���ӧҹ"
+
+#: ../../share/compssUsers:999
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
-"����ͧ���㹡����ҹ����� mail ��� news (pine, mutt, tin..) "
-"��з�ͧ�Թ������"
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C and C++ development libraries, programs and include files"
+#, fuzzy
+msgid "Multimedia - Video"
+msgstr "Multimedia - ��¹ CD "
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "����������¨Ѵ�������ͧ����Թ �� gnucash"
+msgid "Database"
+msgstr ""
 
 #: ../../share/compssUsers:999
 msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, ssh server"
+msgid "Tools to ease the configuration of your computer"
+msgstr "���ͧ��ͷ�����㹡�û�Ѻ������ͧ�ͧ�س�����¢��"
 
 #: ../../share/compssUsers:999
+#, fuzzy
+msgid "Multimedia - Sound"
+msgstr "Multimedia - ��¹ CD "
+
+#: ../../share/compssUsers:999
+msgid "Utilities"
+msgstr ""
+
+#: ../../share/compssUsers:999
+#, fuzzy
 msgid "Documentation"
-msgstr "Documentation"
+msgstr "���˹�"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Console Tools"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "Utilities"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS "
+#, fuzzy
+msgid "Internet station"
+msgstr "����������͡Ѻ Internet Ẻ sharing"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "��÷ӧҹẺ��ҿ�ԡ"
+#, fuzzy
+msgid "Multimedia station"
+msgstr "Multimedia - ��¹ CD "
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Sound"
+#, fuzzy
+msgid "Configuration"
+msgstr "��û�Ѻ�� LAN"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Amusement programs: arcade, boards, strategy, etc"
+#, fuzzy
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Graphical Desktops ����"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Video players and editors"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Console Tools"
+msgid "Graphical Environment"
+msgstr "��÷ӧҹẺ��ҿ�ԡ"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Sound and video playing/editing programs"
+msgid "Development"
+msgstr "�Ѳ�ҫͿ������ (Development)"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Workstation �ҧ�Է����ʵ��"
+msgid "Apache, Pro-ftpd"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editors, shells, file tools, terminals"
+msgid "Tools to create and burn CD's"
+msgstr "����ͧ���㹡�÷� CD"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Books and Howto's on Linux and Free Software"
+msgid "Office Workstation"
+msgstr "Workstation ���ӧҹ"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
+msgid "Graphics programs such as The Gimp"
 msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Games"
-msgstr "Games"
+msgid "DNS/NIS "
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
 
 #: ../../share/compssUsers:999
 #, fuzzy
 msgid "Network Computer server"
-msgstr "Network Computer File server"
+msgstr "����ͧ�������к� Network (Socket)"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Graphics programs such as The Gimp"
+msgid "Mail/Groupware/News"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
+#, fuzzy
+msgid "Game station"
 msgstr "Workstation ���ӧҹ"
 
 #: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "Video players and editors"
 msgstr ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "More Graphical Desktops (Gnome, IceWM)"
+#, fuzzy
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - ��¹ CD "
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "����ͧ���㹡�÷� CD"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - ��¹ CD "
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr "����ͧ���㹡����ҹ����� mail ��� news (pine, mutt, tin..) ��з�ͧ�Թ������"
 
 #: ../../share/compssUsers:999
 msgid "Archiving, emulators, monitoring"
-msgstr "Archiving, emulators, monitoring"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
+msgid "Personal Finance"
+msgstr "����Թ��ǹ���"
 
 #: ../../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 ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
 
 #: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid "Clients for different protocols including ssh"
+msgstr "Clients for different protocols including ssh"
 
 #: ../../share/compssUsers:999
-msgid "Server"
-msgstr "���������"
+#, fuzzy
+msgid "Internet gateway"
+msgstr "��õԴ��� internet"
 
 #: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "����Թ��ǹ���"
+msgid "Sound and video playing/editing programs"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "��ä͹�ԡ"
+msgid "Other Graphical Desktops"
+msgstr "Graphical Desktops ����"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE Workstation"
+msgid "Editors, shells, file tools, terminals"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Graphical Desktops ����"
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "����������¨Ѵ�������ͧ����Թ �� gnucash"
 
 #: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache and Pro-ftpd"
+msgid "Games"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Mail/Groupware/News"
+msgid "Personal Information Management"
+msgstr ""
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome Workstation"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - ��¹ CD "
 
 #: ../../share/compssUsers:999
+msgid "Scientific Workstation"
+msgstr "Workstation �ҧ�Է����ʵ��"
+
+#~ msgid "can not open /etc/sysconfig/autologin for reading: %s"
+#~ msgstr "�������ö�Դ /etc/sysconfig/autologin ����ҹ��: %s"
+
+#~ msgid "Do you want to restart the network"
+#~ msgstr "�س��ͧ���������ӧҹ Network �����������"
+
+#~ msgid ""
+#~ "\n"
+#~ "Do you agree?"
+#~ msgstr ""
+#~ "\n"
+#~ "�س����Ѻ�������"
+
+#~ msgid "I'm about to restart the network device:\n"
+#~ msgstr "�����ѧ��������ӧҹ Network Device ����:\n"
+
+#~ msgid "I'm about to restart the network device %s. Do you agree?"
+#~ msgstr "�����ѧ��������ӧҹ Network Device %s ���� ��ŧ���?"
+
 #, fuzzy
-msgid "Internet gateway"
-msgstr "��õԴ��� internet"
+#~ msgid ""
+#~ "The following printers are configured.\n"
+#~ "You can add some more or modify the existing ones."
+#~ msgstr ""
+#~ "���仹���繢������͡�þ����\n"
+#~ "�س����ö����������������䢢����ŷ������"
 
-#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "����ͧ�������Ѻ Palm Pilot ���� Visor"
+#, fuzzy
+#~ msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+#~ msgstr "��Դ�����������"
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Game station"
+#, fuzzy
+#~ msgid "Could not set \"%s\" as the default printer!"
+#~ msgstr "���͡����� default"
 
-#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+#, fuzzy
+#~ msgid "Test the mouse here."
+#~ msgstr "��سҷ��ͺ������"
+
+#~ msgid ""
+#~ "Please choose your preferred language for installation and system usage."
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Choose the layout corresponding to your keyboard from the list above"
+#~ 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 ""
+#~ "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"
+#~ "\"."
+
+#~ 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"
+#~ " - Ẻ��Ѻ����: ������͡��������X ��Ҥس����¡Ѻ�չء�����������\n"
+#~ "   �س�Ҩ��ͧ������͡��õԴ����к������ҧ�к������, �к�����Ѻ�Ѳ�ҫͿ������\n"
+#~ "   ����Ẻ��������� ������͡ \"����\" ����Ѻ�Դ��駵������ŧ㹤���������\n"
+#~ "   �س�Ҩ���͡ \"�Ѳ�ҫͿ������\" ��Ҥس��ͧ���������������ͧ�س����Ѻ��÷ӧҹ\n"
+#~ "   Ẻ��þѲ�ҫͿ������ �������͡ \"��ÿ������\" ��Ҥس��ͧ���\n"
+#~ "   �Դ��駫Ϳ����������Ѻ�������������� (������� ��þ����...)\n"
+#~ "\n"
+#~ "\n"
+#~ " - Ẻ�������Ǫ�: (����Ѻ���ӹҭ����) ��Ҥس��ҹ GNU/Linux �����ҧ���ͧ����\n"
+#~ "   ��е�ͧ��õԴ���Ẻ���͡���µ��ͧ ��õԴ���Ẻ���������������ش\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 ""
+#~ "�س��ͧ���͡�����ҹ�ͧ����ͧ�س �ҧ���͡���:\n"
+#~ "\n"
+#~ "* Workstation\n"
+#~ "* Development\n"
+#~ "* Server"
+
+#~ 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"
+#~ "��͹���ʼ�ҹ�ͧ���������׹�ѹ��Ҥس���͹���ʼ�ҹ�ç�ѹ\n"
+#~ "\n"
+#~ "\n"
+#~ "�ٷ �繼������к� ����繼����ҹ��§�����Ƿ�����Ѻ͹حҵ���\n"
+#~ "�ӡ�á����䢤͹�ԡ�ͧ�к��� �ѧ��鹤س���繨е�ͧ���͡\n"
+#~ "���ʼ�ҹ���ҧ���Ѵ���ѧ �����ҹ���ͺѭ�բͧ�ٷ��������Ѻ͹حҵ\n"
+#~ "�Ҩ�������Դ��������������ҧ�����ç�Ѻ�����١��ͧ�ͧ�����Ţͧ�к�\n"
+#~ "����������ͧ������������蹷������������� ��á�˹����ʼ�ҹ�е�ͧ�ӡ��\n"
+#~ "�����ҹ�ѹ�����ҧ����ѡ����е���Ţ �������դ���������ҧ���� 8 ����ѡ��\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 ""
+#~ "�͹���س����ö���ҧ���ͺѭ�ռ����Ẻ \"regular\" (�����) ������\n"
+#~ "��觺ѭ��Ẻ����仹��س����ö���ҧ���ҡ����˹�觪��� (�ٷ�������������)\n"
+#~ "��Ъ��ͺѭ�����Ъ��ͨС�˹����੾�м�������Ф������ҹ���������� ���\n"
+#~ "���Ф�����բ�͡�˹��ͧ���ͧ (��Ҿ�Ǵ����Ẻ��ҿ�ԡ, �����������繵�)\n"
+#~ "����� \"home directory\" (���硷��պ�ҹ) �繢ͧ���ͧ���«�����硷��պ�ҹ\n"
+#~ "���繷���红�͡�˹�����ҹ��\n"
+#~ "\n"
+#~ "\n"
+#~ "����á�ش �س�е�ͧ���ҧ���ͺѭ������Ѻ���ͧ �֧�����Ҥس������§����餹\n"
+#~ "������к����� ���ͧ�ҡ�س�������ö��ҵԴ����к��ҡ���͢��¼�ҹ�ҧ\n"
+#~ "���ͼ���� root �� (���ͧ�ҡ�к��ѡ�Ҥ�����ʹ���) ����ҡ�������ö�����\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"
+#~ "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 �Թ�������� ����к� X ����᡹��ҧ�ͧ\n"
+#~ "�к� GUI (Graphical User Interface) �ͧ�չء�� 㹡�ä͹�ԡ�س�е�ͧ\n"
+#~ "�ӡ�ä͹�ԡ�Դ��͡�����Ш��Ҿ ��觢�鹵͹��ǹ�˭����Ẻ�ѵ��ѵԷ�����\n"
+#~ "�ѧ��鹤س����§���Ǩ�ͺ�����١��ͧ ����Ѻ��Һ������к���ҹ���ͧ :)\n"
+#~ "\n"
+#~ "\n"
+#~ "��ѧ�ҡ����ش��ä͹�ԡ X ���������鹷ӧҹ (¡��鹤س��������� DrakX ��)\n"
+#~ "�������س����ö��Ǩ��з�Һ����ҡ���絹������ö��ҹ�� �ҡ�������ö\n"
+#~ "�ӧҹ�� �س����ö��Ѻ���䢡�����Ѿ���ʹ����"
+
+#~ msgid "Czech (Programmers)"
+#~ msgstr "Czech (Programmers)"
+
+#~ msgid "Slovakian (Programmers)"
+#~ msgstr "Slovakian (Programmers)"
+
+#~ msgid "Name of the profile to create:"
+#~ msgstr "���ͧ͢ profile �������ҧ:"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "��¹ŧ� /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 "��ѧ�ҡ��������ء����Ԫ��"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "�����ŷ�����㹾���Ԫ�蹨ж١ź���"
+
+#~ msgid "Reload"
+#~ msgstr "���¡�׹�ա����"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr "�س��ͧ��èз��� floppy ���͡�õԴ���Ẻ�����������?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "��ä͹�ԡ 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 ""
+#~ "������ CUPS SERVER �س�����繵�ͧ��Ѻ������ͧ�����\n"
+#~ "㹵͹���  ����ͧ�����ж١�����ͧ\n"
+#~ "¡��鹤س�� server �� network ��� �óչ�鹤س��ͧ\n"
+#~ "�к� IP ADDRESS ��� port number ���Ѻ CUPS server"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "���ͧ��ͷ�����㹡�û�Ѻ������ͧ�ͧ�س�����¢��"
+#, fuzzy
+#~ msgid "Remote queue name missing!"
+#~ msgstr "���ͤ�������"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Set of tools for mail, news, web, file transfer, and chat"
+#, fuzzy
+#~ msgid "Command line"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Modify printer"
+#~ msgstr "���������ͧ�����"
+
+#, fuzzy
+#~ msgid "start it"
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid "Network Monitoring"
+#~ msgstr "��ä͹�ԡ�к��������"
+
+#, fuzzy
+#~ msgid "Profile "
+#~ msgstr "Profile: "
+
+#, fuzzy
+#~ msgid "Connection Time: "
+#~ msgstr "��Դ�����������"
+
+#, fuzzy
+#~ msgid "Connecting to Internet "
+#~ msgstr "�������� Internet"
+
+#, fuzzy
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "������������� Internet "
+
+#, fuzzy
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "������������� Internet "
+
+#, fuzzy
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "������������� Internet "
+
+#, fuzzy
+#~ msgid "Connection complete."
+#~ msgstr "���͡����������"
+
+#, fuzzy
+#~ msgid "Color configuration"
+#~ msgstr "��ä͹�ԡ"
+
+#, fuzzy
+#~ msgid "Connect"
+#~ msgstr "������������"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "¡��ԡ�Դ���..."
+
+#~ msgid "/File/_New"
+#~ msgstr "/���/_����"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/���/_�Դ"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/���/_�ѹ�֡"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/���/_�ѹ�֡��"
+
+#~ msgid "/File/-"
+#~ msgstr "/���/-"
+
+#~ msgid "/_Help"
+#~ msgstr "/_���������"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/���������/_About..."
+
+#~ msgid "Europe"
+#~ msgstr "���û"
+
+#~ msgid "NetWare"
+#~ msgstr "������"
+
+#~ msgid "Remove queue"
+#~ msgstr "ź���"
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Unrecognized config file"
+
+#, fuzzy
+#~ msgid "Disable network"
+#~ msgstr "¡��ԡ�ӧҹ"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "������ӧҹ"
+
+#~ msgid "DSL (or ADSL) connection"
+#~ msgstr "��õԴ���Ẻ DSL ���� ADSL"
+
+#~ msgid "You can specify directly the URI to access the printer with CUPS."
+#~ msgstr "You can specify directly the URI to access the printer with CUPS."
+
+#~ msgid "Yes, print ASCII test page"
+#~ msgstr "�� ��������д�ɷ��ͺẺ ASCII"
+
+#~ msgid "Yes, print PostScript test page"
+#~ msgstr "�� ��������д�ɷ��ͺẺ�ʵ�ʤ�Ի��"
+
+#~ msgid "Paper Size"
+#~ msgstr "��Ҵ��д��"
+
+#~ msgid "Eject page after job?"
+#~ msgstr "���׹��д���͡����ѧ�ҡ���稧ҹ�����������?"
+
+#~ msgid "Uniprint driver options"
+#~ msgstr "��ͻ��蹢ͧ�������Ẻ Uniprint"
+
+#~ msgid "Color depth options"
+#~ msgstr "��ͻ��蹢ͧ���������´��"
+
+#~ msgid "Print text as PostScript?"
+#~ msgstr "Print text as PostScript?"
+
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "���Ӣ�ͤ��� stair-stepping Ẻ������������"
+
+#~ msgid "Number of pages per output pages"
+#~ msgstr "�ӹǹ˹�ҵ�ͤ���"
+
+#~ msgid "Right/Left margins in points (1/72 of inch)"
+#~ msgstr "���/���� margins ˹��� points (1/72 of inch)"
+
+#~ msgid "Top/Bottom margins in points (1/72 of inch)"
+#~ msgstr "��/��ҧ margins ˹��� points (1/72 of inch)"
+
+#~ msgid "Extra Text options"
+#~ msgstr "��ͻ��蹵��˹ѧ���"
+
+#~ msgid "Reverse page order"
+#~ 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 ""
+#~ "����ͧ�����ء����ͧ��ͧ��ê���\n"
+#~ "����ͧ�������������������\n"
+#~ "����ͧ�������Դ������Ը��"
+
+#~ 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 "Name of queue"
+#~ msgstr "���ͧ͢���"
+
+#~ msgid "Spool directory"
+#~ msgstr "ʻ�����硷���"
+
+#, fuzzy
+#~ msgid "fsck failed: "
+#~ msgstr "������ҷ��������: "
+
+#~ msgid "yellow pages"
+#~ msgstr "���к���ش˹������ͧ (yellow pages)"
+
+#, fuzzy
+#~ msgid "Light configuration"
+#~ msgstr "��û�Ѻ�� LAN"
+
+#~ msgid "How do you want to connect to the Internet?"
+#~ msgstr "�س��ͧ��èе����� Internet ���Ը��"
 
 #, fuzzy
 #~ msgid "Lilo/Grub configuration"
@@ -7372,13 +8695,6 @@ msgstr "Set of tools for mail, news, web, file transfer, and chat"
 #~ msgid "Configure..."
 #~ msgstr "���ѧ�ӡ�û�Ѻ��.."
 
-#~ msgid "Standard tools"
-#~ msgstr "����ͧ��� Standard"
-
-#, fuzzy
-#~ msgid "Configuration de Lilo/Grub"
-#~ msgstr "��ä͹�ԡ"
-
 #~ msgid "This startup script try to load your modules for your usb mouse."
 #~ msgstr "script ������鹹��������������¡�� modules ����Ѻ usb mouse"
 
@@ -7392,9 +8708,6 @@ msgstr "Set of tools for mail, news, web, file transfer, and chat"
 #~ msgid "Welcome to the Internet Connection Sharing utility!"
 #~ msgstr "����������͡Ѻ Internet Ẻ sharing"
 
-#~ msgid "Automatic dependencies"
-#~ msgstr "Automatic dependencies"
-
 #~ msgid "Configure LILO/GRUB"
 #~ msgstr "�͹�ԡ LILO/GRUB"
 
diff --git a/perl-install/share/po/uk.po b/perl-install/share/po/uk.po
index 704203a4f..68274fd6c 100644
--- a/perl-install/share/po/uk.po
+++ b/perl-install/share/po/uk.po
author	Michal Bukovjan <mbukovjan@mandriva.com>	2010-06-08 19:50:34 +0000
committer	Michal Bukovjan <mbukovjan@mandriva.com>	2010-06-08 19:50:34 +0000
commit	29d994ed809a5e12afe3cd93c3bedbe29a3dee40 (patch)
tree	4a93530fecb7258561f2a93b1ec38359e49869f0 /perl-install/run_program.pm
parent	55fc2182b6800a0e42fb3dceba1e1e795d13cccb (diff)
download	drakx-29d994ed809a5e12afe3cd93c3bedbe29a3dee40.tar drakx-29d994ed809a5e12afe3cd93c3bedbe29a3dee40.tar.gz drakx-29d994ed809a5e12afe3cd93c3bedbe29a3dee40.tar.bz2 drakx-29d994ed809a5e12afe3cd93c3bedbe29a3dee40.tar.xz drakx-29d994ed809a5e12afe3cd93c3bedbe29a3dee40.zip